You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2026/09/03 23:35:02 UTC

(maven-wagon) branch design/wagon-ssh-mina-sshd updated (00366018 -> c3718391)

This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a change to branch design/wagon-ssh-mina-sshd
in repository https://gitbox.apache.org/repos/asf/maven-wagon.git


 discard 00366018 Record the design for moving wagon-ssh off JSch
     add b2c093dd Migrate the standalone wagon-http tests to JUnit 5
     add eddedf14 Migrate HugeFileDownloadTest off PlexusTestCase
     add a206db0a Migrate HttpWagonHttpServerTestCase and its subclasses off PlexusTestCase
     add bbaf0d36 Halve the file HugeFileDownloadTest transfers
     add f289bdd5 Migrate ScpWagonWithProxyTest off PlexusTestCase
     add 0962d3e6 Migrate the published test base classes off PlexusTestCase
     add 75501bfb Correct the TCK documentation and remove the unbuilt sample consumer
     add 4c4b84f7 Remove the dead JUnit 4 build configuration and stale references
     add 688c4a41 Drop the CVS tests from the SCM wagon
     add 20a3a190 Upgrade maven-scm to 2.2.1
     add 2c101bcc Replace the CVS examples with Git in the SCM wagon site
     add f8638c06 Update Dependabot config: add GitHub Actions for 3.x
     add b212dfb9 Bump org.codehaus.plexus:plexus-classworlds from 2.12.0 to 2.12.1
     add 14aaf3a7 Bump org.codehaus.plexus:plexus-testing from 2.1.0 to 2.2.0
     add 671f434a Bump org.codehaus.plexus:plexus-interactivity-api from 1.5.1 to 1.6.0
     add a49f303e Update release-drafter config to use shared template with custom tag format
     add 5111b319 Keep configured HTTP headers on the repository origin across redirects
     add 71313d14 Correct test instructions in README.md
     add 4166fe8d BasicAuthScope: map realm=ANY to AuthScope.ANY_REALM
     add 97a91772 Preserve usePreemptive and timeouts across httpConfiguration copy and merge
     add 6eb93557 Honor usePreemptive for PUT requests in AbstractHttpClientWagon
     add e81e5db4 Move wagon-ssh onto the maintained JSch fork
     add 38560830 Stop a stray key file in ~/.ssh from shadowing the SSH agent
     add d83cdc07 Address the review on the agent guard and the key preference
     add 8fa1fe20 Migrate ScpHelperTest to JUnit 5
     add ed7dcba3 Introduce automatic module names for Wagon components (#853)
     add 05d457e5 Fix NPE in ScpExternalWagon when localFile has no parent directory
     add 4e743d22 Upgrade Jetty to 9.4.58.v20250814 and de-aggregate jetty-all (#943)
     add 6a05763f Replace the deprecated plexus-utils APIs in provider code
     add 339ea980 Stop wagon-http from publishing a dependency-reduced POM
     add cea31ce8 Remove wagon-1.x from protected_branches in .asf.yaml
     new c3718391 Record the design for moving wagon-ssh off JSch

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (00366018)
            \
             N -- N -- N   refs/heads/design/wagon-ssh-mina-sshd (c3718391)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .asf.yaml                                          |   1 -
 .github/dependabot.yml                             |  11 +
 .github/release-drafter-3.x.yml                    |  18 --
 .github/release-drafter.yml                        |   1 +
 README.md                                          |   2 +-
 pom.xml                                            |  35 ++-
 src/config/checkstyle-suppressions.xml             |  32 +++
 src/site/markdown/developer-guide.md               |  21 +-
 wagon-provider-api/pom.xml                         |   4 +
 wagon-provider-test/pom.xml                        |  39 +++-
 .../maven/wagon/CommandExecutorTestCase.java       |  28 ++-
 .../apache/maven/wagon/StreamingWagonTestCase.java |  21 +-
 .../java/org/apache/maven/wagon/WagonTestCase.java | 124 +++++++---
 .../apache/maven/wagon/http/HttpWagonTestCase.java | 254 ++++++++++++++++++---
 wagon-providers/wagon-file/pom.xml                 |   4 +
 .../maven/wagon/providers/file/FileWagonTest.java  |   6 +
 wagon-providers/wagon-ftp/pom.xml                  |   4 +
 .../maven/wagon/providers/ftp/FtpWagonTest.java    |   8 +
 wagon-providers/wagon-http-lightweight/pom.xml     |  23 +-
 .../wagon/providers/http/LightweightHttpWagon.java |   4 +-
 .../providers/http/LightweightHttpWagonTest.java   |  63 +++--
 .../apache/maven/wagon/providers/http/TckTest.java |   8 +-
 wagon-providers/wagon-http-shared/pom.xml          |   4 +
 .../wagon/shared/http/AbstractHttpClientWagon.java |  50 ++--
 .../maven/wagon/shared/http/BasicAuthScope.java    |  14 +-
 .../wagon/shared/http/ConfigurationUtils.java      |  17 +-
 .../wagon/shared/http/HttpMethodConfiguration.java |  49 +++-
 .../http/OriginScopedHeadersInterceptor.java       |  99 ++++++++
 .../wagon/shared/http/ConfigurationUtilsTest.java  | 135 +++++++++++
 wagon-providers/wagon-http/pom.xml                 |  30 ++-
 .../http/AbstractHttpClientWagonTest.java          |  12 +-
 .../wagon/providers/http/BasicAuthScopeTest.java   |  44 ++--
 .../providers/http/ErrorWithMessageServlet.java    |  18 +-
 .../wagon/providers/http/HttpClientWagonTest.java  |  11 +-
 .../wagon/providers/http/HttpWagonErrorTest.java   |  12 +-
 .../http/HttpWagonHttpServerTestCase.java          |  22 +-
 .../maven/wagon/providers/http/HttpWagonTest.java  |   2 +-
 .../wagon/providers/http/HttpWagonTimeoutTest.java |  12 +-
 .../wagon/providers/http/HugeFileDownloadTest.java |  24 +-
 .../apache/maven/wagon/providers/http/TckTest.java |   8 +-
 wagon-providers/wagon-scm/pom.xml                  |  31 ++-
 .../wagon-scm/src/site/markdown/index.md           |   7 +-
 .../wagon-scm/src/site/markdown/usage.md.vm        |  12 +-
 .../providers/scm/AbstractScmCvsWagonTest.java     |  57 -----
 .../providers/scm/AbstractScmGitWagonTest.java     |   4 +-
 .../providers/scm/AbstractScmSvnWagonTest.java     |   4 +-
 .../wagon/providers/scm/AbstractScmWagonTest.java  |   7 +-
 .../wagon/providers/scm/ScmCvsExeWagonTest.java    |  74 ------
 .../wagon/providers/scm/ScmGitExeWagonTest.java    |   9 +-
 .../providers/scm/UserSafeGitExeScmProvider.java   |   8 +-
 .../resources/test-repo-cvs/CVSROOT/checkoutlist   |  13 --
 .../resources/test-repo-cvs/CVSROOT/checkoutlist,v |  36 ---
 .../resources/test-repo-cvs/CVSROOT/commitinfo     |  15 --
 .../resources/test-repo-cvs/CVSROOT/commitinfo,v   |  38 ---
 .../test/resources/test-repo-cvs/CVSROOT/config    |  21 --
 .../test/resources/test-repo-cvs/CVSROOT/config,v  |  44 ----
 .../resources/test-repo-cvs/CVSROOT/cvswrappers    |  19 --
 .../resources/test-repo-cvs/CVSROOT/cvswrappers,v  |  42 ----
 .../test/resources/test-repo-cvs/CVSROOT/editinfo  |  21 --
 .../resources/test-repo-cvs/CVSROOT/editinfo,v     |  44 ----
 .../test/resources/test-repo-cvs/CVSROOT/history   |   2 -
 .../test/resources/test-repo-cvs/CVSROOT/loginfo   |  26 ---
 .../test/resources/test-repo-cvs/CVSROOT/loginfo,v |  49 ----
 .../test/resources/test-repo-cvs/CVSROOT/modules   |  26 ---
 .../test/resources/test-repo-cvs/CVSROOT/modules,v |  49 ----
 .../resources/test-repo-cvs/CVSROOT/modules.db     | Bin 3072 -> 0 bytes
 .../test/resources/test-repo-cvs/CVSROOT/notify    |  12 -
 .../test/resources/test-repo-cvs/CVSROOT/notify,v  |  35 ---
 .../test/resources/test-repo-cvs/CVSROOT/rcsinfo   |  13 --
 .../test/resources/test-repo-cvs/CVSROOT/rcsinfo,v |  36 ---
 .../test/resources/test-repo-cvs/CVSROOT/taginfo   |  20 --
 .../test/resources/test-repo-cvs/CVSROOT/taginfo,v |  43 ----
 .../resources/test-repo-cvs/CVSROOT/val-tags.db    |   0
 .../test/resources/test-repo-cvs/CVSROOT/verifymsg |  21 --
 .../resources/test-repo-cvs/CVSROOT/verifymsg,v    |  44 ----
 .../resources/test-repo-cvs/repository/dummy,v     |  23 --
 wagon-providers/wagon-ssh-common-test/pom.xml      |   6 +
 .../ssh/AbstractEmbeddedScpWagonTest.java          |   7 +-
 .../ssh/AbstractEmbeddedScpWagonWithKeyTest.java   |  13 +-
 .../ssh/knownhost/KnownHostsProviderTestCase.java  |  30 ++-
 wagon-providers/wagon-ssh-common/pom.xml           |   4 +
 .../maven/wagon/providers/ssh/ScpHelper.java       |  56 ++++-
 .../ssh/knownhost/StreamKnownHostsProvider.java    |  20 +-
 .../maven/wagon/providers/ssh/ScpHelperTest.java   |  57 +++++
 wagon-providers/wagon-ssh-external/pom.xml         |   1 +
 .../providers/ssh/external/ScpExternalWagon.java   |  26 ++-
 .../EmbeddedScpExternalWagonWithKeyTest.java       |   2 +
 ...nalWagonTest.java => ExternalScpWagonTest.java} |  87 ++++---
 .../ssh/external/ScpExternalWagonTest.java         |   5 +
 wagon-providers/wagon-ssh/pom.xml                  |  29 ++-
 .../providers/ssh/jsch/AbstractJschWagon.java      | 127 +++++++++--
 .../providers/ssh/jsch/ScpWagonWithProxyTest.java  |  25 +-
 .../jsch/ScpWagonWithSshPrivateKeySearchTest.java  |   6 +
 wagon-providers/wagon-webdav-jackrabbit/pom.xml    |  23 +-
 .../wagon/providers/webdav/WebDavWagonTest.java    | 106 +++++----
 wagon-tcks/wagon-tck-http/pom.xml                  |  35 ++-
 .../wagon-tck-http/sample-tck-consumer/pom.xml     |  66 ------
 .../maven/wagon/tck/http/consumer/TestSuite.java   |  31 ---
 .../test/resources/META-INF/plexus/components.xml  |  32 ---
 .../META-INF/wagon-tck/http-use-cases.xml          |  26 ---
 .../apache/maven/wagon/tck/http/Assertions.java    |  65 +++---
 .../apache/maven/wagon/tck/http/GetWagonTests.java |  16 +-
 .../maven/wagon/tck/http/HttpWagonTests.java       |  16 +-
 .../wagon/tck/http/fixture/ServerFixture.java      |  11 +-
 104 files changed, 1613 insertions(+), 1494 deletions(-)
 delete mode 100644 .github/release-drafter-3.x.yml
 create mode 100644 src/config/checkstyle-suppressions.xml
 create mode 100644 wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/OriginScopedHeadersInterceptor.java
 create mode 100644 wagon-providers/wagon-http-shared/src/test/java/org/apache/maven/wagon/shared/http/ConfigurationUtilsTest.java
 delete mode 100644 wagon-providers/wagon-scm/src/test/java/org/apache/maven/wagon/providers/scm/AbstractScmCvsWagonTest.java
 delete mode 100644 wagon-providers/wagon-scm/src/test/java/org/apache/maven/wagon/providers/scm/ScmCvsExeWagonTest.java
 delete mode 100644 wagon-providers/wagon-scm/src/test/resources/test-repo-cvs/CVSROOT/checkoutlist
 delete mode 100644 wagon-providers/wagon-scm/src/test/resources/test-repo-cvs/CVSROOT/checkoutlist,v
 delete mode 100644 wagon-providers/wagon-scm/src/test/resources/test-repo-cvs/CVSROOT/commitinfo
 delete mode 100644 wagon-providers/wagon-scm/src/test/resources/test-repo-cvs/CVSROOT/commitinfo,v
 delete mode 100644 wagon-providers/wagon-scm/src/test/resources/test-repo-cvs/CVSROOT/config
 delete mode 100644 wagon-providers/wagon-scm/src/test/resources/test-repo-cvs/CVSROOT/config,v
 delete mode 100644 wagon-providers/wagon-scm/src/test/resources/test-repo-cvs/CVSROOT/cvswrappers
 delete mode 100644 wagon-providers/wagon-scm/src/test/resources/test-repo-cvs/CVSROOT/cvswrappers,v
 delete mode 100644 wagon-providers/wagon-scm/src/test/resources/test-repo-cvs/CVSROOT/editinfo
 delete mode 100644 wagon-providers/wagon-scm/src/test/resources/test-repo-cvs/CVSROOT/editinfo,v
 delete mode 100644 wagon-providers/wagon-scm/src/test/resources/test-repo-cvs/CVSROOT/history
 delete mode 100644 wagon-providers/wagon-scm/src/test/resources/test-repo-cvs/CVSROOT/loginfo
 delete mode 100644 wagon-providers/wagon-scm/src/test/resources/test-repo-cvs/CVSROOT/loginfo,v
 delete mode 100644 wagon-providers/wagon-scm/src/test/resources/test-repo-cvs/CVSROOT/modules
 delete mode 100644 wagon-providers/wagon-scm/src/test/resources/test-repo-cvs/CVSROOT/modules,v
 delete mode 100644 wagon-providers/wagon-scm/src/test/resources/test-repo-cvs/CVSROOT/modules.db
 delete mode 100644 wagon-providers/wagon-scm/src/test/resources/test-repo-cvs/CVSROOT/notify
 delete mode 100644 wagon-providers/wagon-scm/src/test/resources/test-repo-cvs/CVSROOT/notify,v
 delete mode 100644 wagon-providers/wagon-scm/src/test/resources/test-repo-cvs/CVSROOT/rcsinfo
 delete mode 100644 wagon-providers/wagon-scm/src/test/resources/test-repo-cvs/CVSROOT/rcsinfo,v
 delete mode 100644 wagon-providers/wagon-scm/src/test/resources/test-repo-cvs/CVSROOT/taginfo
 delete mode 100644 wagon-providers/wagon-scm/src/test/resources/test-repo-cvs/CVSROOT/taginfo,v
 delete mode 100644 wagon-providers/wagon-scm/src/test/resources/test-repo-cvs/CVSROOT/val-tags.db
 delete mode 100644 wagon-providers/wagon-scm/src/test/resources/test-repo-cvs/CVSROOT/verifymsg
 delete mode 100644 wagon-providers/wagon-scm/src/test/resources/test-repo-cvs/CVSROOT/verifymsg,v
 delete mode 100644 wagon-providers/wagon-scm/src/test/resources/test-repo-cvs/repository/dummy,v
 create mode 100644 wagon-providers/wagon-ssh-common/src/test/java/org/apache/maven/wagon/providers/ssh/ScpHelperTest.java
 copy wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/ssh/external/{ScpExternalWagonTest.java => ExternalScpWagonTest.java} (51%)
 delete mode 100644 wagon-tcks/wagon-tck-http/sample-tck-consumer/pom.xml
 delete mode 100644 wagon-tcks/wagon-tck-http/sample-tck-consumer/src/test/java/org/apache/maven/wagon/tck/http/consumer/TestSuite.java
 delete mode 100644 wagon-tcks/wagon-tck-http/sample-tck-consumer/src/test/resources/META-INF/plexus/components.xml
 delete mode 100644 wagon-tcks/wagon-tck-http/sample-tck-consumer/src/test/resources/META-INF/wagon-tck/http-use-cases.xml


(maven-wagon) 01/01: Record the design for moving wagon-ssh off JSch

Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch design/wagon-ssh-mina-sshd
in repository https://gitbox.apache.org/repos/asf/maven-wagon.git

commit c3718391abe93a1e4d49af1be494b6f4c0b3efc0
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sun Aug 16 14:18:17 2026 +0200

    Record the design for moving wagon-ssh off JSch
    
    Kept in the repository rather than in an issue because the sequencing
    commits five separate PRs to decisions taken once: that ScpWagon keeps
    its hand-rolled scp wire protocol, that sshd-scp is deliberately not a
    dependency, and that the embedded-server tests must be green before any
    of it starts. Each PR in the series refers back to this file.
    
    Not under src/site: this is a working document for committers, not a
    published page.
---
 docs/design/2026-08-10-wagon-ssh-mina-sshd.md | 192 ++++++++++++++++++++++++++
 1 file changed, 192 insertions(+)

diff --git a/docs/design/2026-08-10-wagon-ssh-mina-sshd.md b/docs/design/2026-08-10-wagon-ssh-mina-sshd.md
new file mode 100644
index 00000000..6d857515
--- /dev/null
+++ b/docs/design/2026-08-10-wagon-ssh-mina-sshd.md
@@ -0,0 +1,192 @@
+# Design: replace JSch with Apache MINA SSHD in wagon-ssh
+
+Date: 2026-08-10
+Target: `org.apache.maven.wagon:wagon-ssh` 4.0.0-M1
+Status: approved design, implementation plan not yet written
+
+## Motivation
+
+`wagon-ssh` pins `com.jcraft:jsch:0.1.55` (last released 2018) and
+`com.jcraft:jsch.agentproxy:0.0.9`. Neither is maintained. JSch 0.1.55 does not
+implement `rsa-sha2-256`/`rsa-sha2-512` and cannot read OpenSSH-format ed25519
+keys, so it fails against the defaults of current OpenSSH servers.
+
+Apache MINA SSHD 2.19.0 is already a dependency of the build:
+`wagon-ssh-common-test` runs the embedded test server on `sshd-core`,
+`sshd-scp` and `sshd-sftp`. Moving the client side onto SSHD adds no new
+third-party surface and puts both ends of the test on the same stack.
+
+## Decisions taken
+
+| Question | Decision |
+|---|---|
+| Migration shape | Replace in place. Keep artifactId `wagon-ssh` and the `scp`/`sftp` role hints; rewrite internals under `org.apache.maven.wagon.providers.ssh.sshd` and delete the `jsch` package. |
+| HTTP/SOCKS5 proxy | Ship SOCKS5 only. HTTP CONNECT is rejected with an actionable error. |
+| ssh-agent | SSHD `SshAgentFactory` with the agent module declared `<optional>true</optional>`. |
+| known_hosts | Delegate to SSHD's `KnownHostsServerKeyVerifier`; deprecate the wagon `KnownHostsProvider` SPI. |
+
+## Current state
+
+JSch coupling is ~1350 lines across seven classes in one package:
+
+- `AbstractJschWagon` (415) — session, auth, proxy, known_hosts
+- `ScpWagon` (388) — `ChannelExec` plus a hand-rolled scp wire protocol
+- `SftpWagon` (451) — `ChannelSftp`, `SftpATTRS`
+- `WagonUserInfo` (76)
+- `interactive/UserInfoUIKeyboardInteractiveProxy` (93)
+- `interactive/PrompterUIKeyboardInteractive` (83)
+- `ScpCommandExecutor` (41)
+
+`wagon-ssh-common` is JSch-free — the name appears only in javadoc prose.
+`wagon-ssh-external` likewise. Consumers bind to the `scp`/`sftp` role hints,
+not to class names.
+
+The only JSch type in a public wagon signature is
+`AbstractJschWagon.setUIKeyboardInteractive(com.jcraft.jsch.UIKeyboardInteractive)`.
+
+Outside this repo, exactly one file imports the package:
+`maven-it-plugin-uses-wagon` imports `...ssh.jsch.ScpWagon`, present in
+`core/maven`, `core/maven-4.0.x` and `core/3.x/its-3`.
+
+## Module layout
+
+`wagon-ssh` keeps its GAV. Dependency changes:
+
+Removed:
+- `com.jcraft:jsch:0.1.55`
+- `com.jcraft:jsch.agentproxy.connector-factory:0.0.9`
+- `com.jcraft:jsch.agentproxy.jsch:0.0.9`
+
+Added:
+- `org.apache.sshd:sshd-core`
+- `org.apache.sshd:sshd-sftp`
+- SSHD agent module, `<optional>true</optional>`
+
+`sshd-scp` is deliberately **not** added — see `ScpWagon` below.
+
+`sshdVersion` moves out of `wagon-ssh-common-test`'s `<properties>` into the
+root pom's `dependencyManagement`, so the client and the embedded test server
+cannot drift apart.
+
+`wagon-ssh-common` and `wagon-ssh-external` are untouched.
+
+## Class-by-class
+
+### `AbstractSshdWagon` (was `AbstractJschWagon`)
+
+One `SshClient.setUpDefaultClient()` per wagon instance, started in
+`openConnectionInternal`, `client.stop()` in `closeConnection`.
+
+- `session.setTimeout(getTimeout())` becomes `connect(...).verify(Duration)`
+  plus `CoreModuleProperties.IDLE_TIMEOUT`.
+- `executeCommand` swaps `session.openChannel("exec")` for
+  `session.createExecChannel(cmd)`. `getInvertedOut()`/`getInvertedErr()` feed
+  the existing `CommandExecutorStreamProcessor` unchanged, so stdout/stderr
+  handling and the exit-code contract are preserved.
+
+### `ScpWagon`
+
+**Keeps its hand-rolled scp wire protocol.** The `C0644` header, ack bytes and
+`E\n` terminator are server-side protocol, not a JSch artifact, and
+`StreamWagon.fillInputData`/`fillOutputData` must hand raw streams back to the
+caller — which `sshd-scp`'s `ScpClient` does not do. Only channel acquisition
+changes.
+
+This is the single largest risk reduction in the plan. In particular it retains
+the already-tuned divergence where OpenSSH reports a missing file with the scp
+warning code (1) and MINA sshd reports it with the fatal code (2).
+
+### `SftpWagon`
+
+The one genuine rewrite.
+
+- `ChannelSftp` → `SftpClientFactory.instance().createSftpClient(session)`
+- `SftpATTRS` → `SftpClient.Attributes`
+- `channel.ls()` → `readDir()`
+- `stat`/`mkdir`/`chmod` map directly
+
+`SftpClient` has no working directory, so the `cd`-relative navigation in
+`changeToRepositoryDirectory` becomes absolute-path construction.
+
+### Interaction classes
+
+`WagonUserInfo`, `UserInfoUIKeyboardInteractiveProxy` and
+`PrompterUIKeyboardInteractive` collapse into a single
+`WagonUserInteraction implements org.apache.sshd.client.auth.keyboard.UserInteraction`,
+driven by the existing `InteractiveUserInfo` and the plexus `Prompter`.
+
+This deletes `setUIKeyboardInteractive(com.jcraft.jsch.UIKeyboardInteractive)`,
+the only JSch type that ever leaked into a public wagon signature.
+
+### `transfer()` override
+
+`AbstractJschWagon` overrides `StreamWagon.transfer` solely to work around JSch
+issue #122, as its own comment records. Delete the override and let
+`StreamWagon.transfer` run. The embedded-server tests are the check.
+
+## Behaviour changes
+
+All intentional, all confined to 4.0.0-M1.
+
+| Area | Before | After |
+|---|---|---|
+| known_hosts | wagon `KnownHostsProvider` SPI (`file`/`single`/`null`) | `KnownHostsServerKeyVerifier` on `~/.ssh/known_hosts`. SPI deprecated and no longer consulted. `strictHostKeyChecking` maps `no` → accept-all, `yes` → reject-unknown, `ask` → verifier plus `UserInteraction` prompt. `UnknownHostException` and `KnownHostChangedException` are still thrown. Gains hashed-host and host-certificate support. |
+| HTTP proxy | `ProxyHTTP` | Rejected at connect time with a message pointing at `ProxyCommand` and `wagon-ssh-external`. |
+| SOCKS5 proxy | `ProxySOCKS5` | wagon-owned SOCKS5 handshake on SSHD's `ClientProxyConnector`. The legacy port-1080 fallback is preserved; that fallback's non-1080 branch now errors instead of silently using HTTP. |
+| ssh-agent | jsch.agentproxy (JNA, Pageant) | SSHD `SshAgentFactory`, optional dependency. Works when the jar is present; falls through to key/password authentication when it is not. |
+| Algorithms | no `rsa-sha2-*`, no OpenSSH-format ed25519 | whatever SSHD 2.19 supports. This is the point of the exercise. |
+
+### Compatibility note that needs dev@ visibility
+
+`FileKnownHostsProvider` already defaults to `~/.ssh/known_hosts`, so the common
+path is unchanged. But anyone configuring `knownHostsProvider` in
+`settings.xml`, and anyone using `NullKnownHostProvider` as an escape hatch,
+breaks silently. This warrants an `[ATTENTION]` mail on dev@, not only a
+release note.
+
+## Testing
+
+The safety net already exists — commit `d3ba3463` revived the embedded MINA
+server tests — but it is opt-in, so CI being green today does not mean those
+tests pass.
+
+1. Before touching anything, enable `ssh-embedded` and record the green
+   baseline. **If the embedded tests do not pass when un-excluded, fixing them
+   is a prerequisite, not part of this migration.**
+2. Migrate with those tests as the gate. `SftpWagonTest` and
+   `SshCommandExecutorTest` appear in every `<excludes>` block in
+   `wagon-ssh/pom.xml`; they must be un-excluded against the embedded server or
+   the sftp rewrite ships untested.
+3. New tests: a SOCKS5 proxy test with a minimal SOCKS5 listener in
+   `wagon-ssh-common-test`, mirroring the existing `ScpWagonWithProxyTest`
+   shape; and an assertion on rsa-sha2 negotiation that would have failed on
+   JSch 0.1.55.
+4. Manual matrix before release: real OpenSSH 9.x, `~/.ssh/config` in play,
+   ed25519 key, agent present and absent.
+
+## Sequencing
+
+Five PRs, each independently green:
+
+1. Hoist `sshdVersion` into the root `dependencyManagement`; un-exclude the
+   embedded tests; record the baseline. No behaviour change.
+2. `AbstractSshdWagon`, `ScpWagon` and `ScpCommandExecutor` on SSHD, with
+   known_hosts and interaction rewired. Proxy and agent temporarily
+   unsupported.
+3. `SftpWagon` on `SftpClient`.
+4. SOCKS5 `ClientProxyConnector` and its test.
+5. Optional agent dependency, plus the docs sweep: `src/site/markdown/user-guide.md`
+   (two places), `src/site/markdown/developer-guide.md`,
+   `wagon-providers/wagon-ssh/src/site/markdown/index.md`, and the jcraft
+   `<area>` in the root `src/site/markdown/index.md` image map. No page URL or
+   anchor changes.
+
+Follow-up outside this repo: the `ScpWagon` import in
+`maven-it-plugin-uses-wagon`, in `core/maven`, `core/maven-4.0.x` and
+`core/3.x/its-3`.
+
+## Out of scope
+
+- `wagon-ssh-external`
+- The 3.x maintenance line — JSch stays there
+- Retiring `wagon-ssh`