diff --git a/build.sbt b/build.sbt index 327a350..6cbf944 100644 --- a/build.sbt +++ b/build.sbt @@ -33,7 +33,7 @@ "org.apache.commons" % "commons-compress" % "1.11", "org.apache.commons" % "commons-email" % "1.4", "org.apache.httpcomponents" % "httpclient" % "4.5.1", - "org.apache.sshd" % "apache-sshd" % "1.0.0", + "org.apache.sshd" % "apache-sshd" % "1.2.0", "org.apache.tika" % "tika-core" % "1.13", "com.typesafe.slick" %% "slick" % "2.1.0", "com.novell.ldap" % "jldap" % "2009-10-07", diff --git a/src/main/scala/gitbucket/core/ssh/GitCommand.scala b/src/main/scala/gitbucket/core/ssh/GitCommand.scala index b4a76f7..a2f18e7 100644 --- a/src/main/scala/gitbucket/core/ssh/GitCommand.scala +++ b/src/main/scala/gitbucket/core/ssh/GitCommand.scala @@ -13,7 +13,7 @@ import org.eclipse.jgit.api.Git import Directory._ import org.eclipse.jgit.transport.{ReceivePack, UploadPack} -import org.apache.sshd.server.command.UnknownCommand +import org.apache.sshd.server.scp.UnknownCommand import org.eclipse.jgit.errors.RepositoryNotFoundException object GitCommand { diff --git a/src/main/scala/gitbucket/core/ssh/PublicKeyAuthenticator.scala b/src/main/scala/gitbucket/core/ssh/PublicKeyAuthenticator.scala index 7e06eea..8ed2cfb 100644 --- a/src/main/scala/gitbucket/core/ssh/PublicKeyAuthenticator.scala +++ b/src/main/scala/gitbucket/core/ssh/PublicKeyAuthenticator.scala @@ -7,12 +7,12 @@ import gitbucket.core.servlet.Database import org.apache.sshd.server.auth.pubkey.PublickeyAuthenticator import org.apache.sshd.server.session.ServerSession -import org.apache.sshd.common.session.Session +import org.apache.sshd.common.AttributeStore import org.slf4j.LoggerFactory object PublicKeyAuthenticator { // put in the ServerSession here to be read by GitCommand later - private val userNameSessionKey = new Session.AttributeKey[String] + private val userNameSessionKey = new AttributeStore.AttributeKey[String] def putUserName(serverSession:ServerSession, userName:String):Unit = serverSession.setAttribute(userNameSessionKey, userName) diff --git a/src/test/scala/gitbucket/core/ssh/GitCommandSpec.scala b/src/test/scala/gitbucket/core/ssh/GitCommandSpec.scala index ddde2c9..101352c 100644 --- a/src/test/scala/gitbucket/core/ssh/GitCommandSpec.scala +++ b/src/test/scala/gitbucket/core/ssh/GitCommandSpec.scala @@ -1,6 +1,6 @@ package gitbucket.core.ssh -import org.apache.sshd.server.command.UnknownCommand +import org.apache.sshd.server.scp.UnknownCommand import org.scalatest.FunSpec class GitCommandFactorySpec extends FunSpec {