From 0f3fdd8d4d8884a821069b65e08cfe197bf45bd2 Mon Sep 17 00:00:00 2001 From: ricardop Date: Wed, 3 Jan 2018 16:09:27 +0100 Subject: upgrade to sshd 1.6.0, add eddsa dependency, upgrade jgit to 4.1.2 (cherry picked from commit d8fbdda2ab3fa48e92bdf37399d4b75c48409c5c@rpardini:master) # Conflicts: # .classpath # build.moxie # src/test/java/com/gitblit/tests/SshUnitTest.java --- src/test/java/com/gitblit/tests/LdapPublicKeyManagerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/test/java') diff --git a/src/test/java/com/gitblit/tests/LdapPublicKeyManagerTest.java b/src/test/java/com/gitblit/tests/LdapPublicKeyManagerTest.java index c426254f..1ec6671a 100644 --- a/src/test/java/com/gitblit/tests/LdapPublicKeyManagerTest.java +++ b/src/test/java/com/gitblit/tests/LdapPublicKeyManagerTest.java @@ -28,7 +28,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.sshd.common.util.SecurityUtils; +import org.apache.sshd.common.util.security.SecurityUtils; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; -- cgit v1.2.3