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

garydgregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-vfs.git


The following commit(s) were added to refs/heads/master by this push:
     new 263f0f84f [test] Bump mina.sshd.version from 3.0.0-M5 to 3.0.0-M6
263f0f84f is described below

commit 263f0f84f6e1d2ac93c3031fb5c0c207e54b0cb6
Author: Gary Gregory <[email protected]>
AuthorDate: Mon Sep 28 21:24:58 2026 +0000

    [test] Bump mina.sshd.version from 3.0.0-M5 to 3.0.0-M6
---
 .../commons/vfs2/provider/sftp/SftpTestServerHelper.java       | 10 +++++++---
 pom.xml                                                        |  2 +-
 src/changes/changes.xml                                        |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git 
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpTestServerHelper.java
 
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpTestServerHelper.java
index a7af3e32e..f8aa7d722 100644
--- 
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpTestServerHelper.java
+++ 
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpTestServerHelper.java
@@ -48,7 +48,9 @@ import org.apache.sshd.server.ExitCallback;
 import org.apache.sshd.server.SshServer;
 import org.apache.sshd.server.auth.UserAuthFactory;
 import org.apache.sshd.server.auth.UserAuthNoneFactory;
+import org.apache.sshd.server.auth.password.UserAuthPasswordFactory;
 import org.apache.sshd.server.auth.pubkey.AcceptAllPublickeyAuthenticator;
+import org.apache.sshd.server.auth.pubkey.UserAuthPublicKeyFactory;
 import org.apache.sshd.server.channel.ChannelSession;
 import org.apache.sshd.server.command.Command;
 import org.apache.sshd.server.command.CommandFactory;
@@ -277,12 +279,14 @@ public final class SftpTestServerHelper {
         server.setCommandFactory(new TestCommandFactory());
         final File homeDir = getTestDirectoryFile();
         server.setFileSystemFactory(new 
VirtualFileSystemFactory(homeDir.toPath().toAbsolutePath()));
-        server.start();
-        final List<UserAuthFactory> authFactories = new 
ArrayList<>(server.getUserAuthFactories());
+        final List<UserAuthFactory> authFactories = new ArrayList<>();
+        authFactories.add(UserAuthPasswordFactory.INSTANCE);
+        authFactories.add(UserAuthPublicKeyFactory.INSTANCE);
         authFactories.add(UserAuthNoneFactory.INSTANCE);
         server.setUserAuthFactories(authFactories);
+        server.start();
         final int socketPort = server.getPort();
-        connectionUri = String.format("sftp://%s@localhost:%d";, DEFAULT_USER, 
socketPort);
+        connectionUri = String.format("sftp://%s:%s@localhost:%d";, 
DEFAULT_USER, DEFAULT_USER, socketPort);
     }
 
     /**
diff --git a/pom.xml b/pom.xml
index 5e0581a70..3c23295f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,7 +93,7 @@
     <httpcore5.version>5.4.4</httpcore5.version>
     <httpclient5.version>5.6.4</httpclient5.version>
     <jackrabbit1.version>1.6.5</jackrabbit1.version>
-    <mina.sshd.version>3.0.0-M5</mina.sshd.version>
+    <mina.sshd.version>3.0.0-M6</mina.sshd.version>
     <!-- Don't use jackrabbit2 2.21.x, it's labeled "unstable". -->
     <!-- 2.22.0 requires Java 11. -->
     <jackrabbit2.version>2.20.17</jackrabbit2.version>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 45c6d0f13..39d535f8f 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -101,7 +101,7 @@ The <action> type attribute can be add,update,fix,remove.
       <action type="update" dev="ggregory" due-to="Gary Gregory, 
Dependabot">Bump hadoop.version from 3.4.1 to 3.4.3 #717, #756, still doesn't 
work on Java 23 and up 
(https://issues.apache.org/jira/browse/HADOOP-19486).</action>
       <action type="update" dev="ggregory" due-to="Gary Gregory">Bump 
commons-logging:commons-logging from 1.3.5 to 1.4.0.</action>
       <action type="update" dev="ggregory" due-to="Gary Gregory, 
Dependabot">Bump org.apache.ant:ant from 1.10.15 to 1.10.18 #760.</action>
-      <action type="update" dev="ggregory" due-to="Gary Gregory, 
Dependabot">[test] Bump mina.sshd.version from 3.0.0-M3 to 3.0.0-M5 (#768, 
#776).</action>
+      <action type="update" dev="ggregory" due-to="Gary Gregory, 
Dependabot">[test] Bump mina.sshd.version from 3.0.0-M3 to 3.0.0-M6 (#768, 
#776).</action>
     </release>
     <release version="2.10.0" date="2025-02-01" description="This is a feature 
and maintenance release. Java 8 or later is required.">
       <!-- FIX -->

Reply via email to