diff options
| author | James Moger <james.moger@gitblit.com> | 2015-09-18 08:30:29 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2015-09-18 08:30:29 -0400 |
| commit | d41034ad2ff334707a58ace5f3cd1de5fcfa1815 (patch) | |
| tree | 3ec46a835526583008d53184d954bbf48b242f69 /src/test | |
| parent | 5364419d0d1be1ae9d43cb277b82f0adb94112af (diff) | |
| download | gitblit-d41034ad2ff334707a58ace5f3cd1de5fcfa1815.tar.gz gitblit-d41034ad2ff334707a58ace5f3cd1de5fcfa1815.zip | |
Update to SSHD 1.0.0
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/java/com/gitblit/tests/SshDaemonTest.java | 4 | ||||
| -rw-r--r-- | src/test/java/com/gitblit/tests/SshUnitTest.java | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/test/java/com/gitblit/tests/SshDaemonTest.java b/src/test/java/com/gitblit/tests/SshDaemonTest.java index dcaeaff8..c5deb7d5 100644 --- a/src/test/java/com/gitblit/tests/SshDaemonTest.java +++ b/src/test/java/com/gitblit/tests/SshDaemonTest.java @@ -19,8 +19,8 @@ import java.io.File; import java.text.MessageFormat; import java.util.List; -import org.apache.sshd.ClientSession; -import org.apache.sshd.SshClient; +import org.apache.sshd.client.SshClient; +import org.apache.sshd.client.session.ClientSession; import org.eclipse.jgit.api.CloneCommand; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.revwalk.RevCommit; diff --git a/src/test/java/com/gitblit/tests/SshUnitTest.java b/src/test/java/com/gitblit/tests/SshUnitTest.java index 3def700d..453f3043 100644 --- a/src/test/java/com/gitblit/tests/SshUnitTest.java +++ b/src/test/java/com/gitblit/tests/SshUnitTest.java @@ -28,14 +28,14 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.sshd.ClientChannel; -import org.apache.sshd.ClientSession; -import org.apache.sshd.SshClient; import org.apache.sshd.client.ServerKeyVerifier; +import org.apache.sshd.client.SshClient; +import org.apache.sshd.client.auth.UserAuth; +import org.apache.sshd.client.auth.UserAuthPublicKeyFactory; +import org.apache.sshd.client.channel.ClientChannel; +import org.apache.sshd.client.session.ClientSession; import org.apache.sshd.common.NamedFactory; import org.apache.sshd.common.util.SecurityUtils; -import org.apache.sshd.client.UserAuth; -import org.apache.sshd.client.auth.UserAuthPublicKey; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; @@ -108,7 +108,7 @@ public abstract class SshUnitTest extends GitblitUnitTest { } }); List<NamedFactory<UserAuth>> userAuthFactories = new ArrayList<>(); - userAuthFactories.add(new UserAuthPublicKey.Factory()); + userAuthFactories.add(new UserAuthPublicKeyFactory()); client.setUserAuthFactories(userAuthFactories); client.start(); return client; |