From c47e48ace88f143d7bcdd6bdbdf9f35cc50e75bd Mon Sep 17 00:00:00 2001
From: Uli Heller <uli.heller@daemons-point.com>
Date: Fri, 5 Oct 2018 13:45:40 +0200
Subject: [PATCH] Fixes for apache-sshd-2.1.0: Package name for Command and
 CommandFactory

---
 src/main/scala/gitbucket/core/plugin/Plugin.scala         | 2 +-
 src/main/scala/gitbucket/core/plugin/PluginRegistry.scala | 2 +-
 src/main/scala/gitbucket/core/ssh/GitCommand.scala        | 3 ++-
 src/main/scala/gitbucket/core/ssh/NoShell.scala           | 3 ++-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/scala/gitbucket/core/plugin/Plugin.scala b/src/main/scala/gitbucket/core/plugin/Plugin.scala
index 92a51ea23..06355f299 100644
--- a/src/main/scala/gitbucket/core/plugin/Plugin.scala
+++ b/src/main/scala/gitbucket/core/plugin/Plugin.scala
@@ -8,7 +8,7 @@ import gitbucket.core.service.RepositoryService.RepositoryInfo
 import gitbucket.core.service.SystemSettingsService.SystemSettings
 import gitbucket.core.util.SyntaxSugars._
 import io.github.gitbucket.solidbase.model.Version
-import org.apache.sshd.server.Command
+import org.apache.sshd.server.command.Command
 import play.twirl.api.Html
 
 /**
diff --git a/src/main/scala/gitbucket/core/plugin/PluginRegistry.scala b/src/main/scala/gitbucket/core/plugin/PluginRegistry.scala
index 6964732da..c37f1aede 100644
--- a/src/main/scala/gitbucket/core/plugin/PluginRegistry.scala
+++ b/src/main/scala/gitbucket/core/plugin/PluginRegistry.scala
@@ -24,7 +24,7 @@ import io.github.gitbucket.solidbase.manager.JDBCVersionManager
 import io.github.gitbucket.solidbase.model.Module
 import org.apache.commons.io.FileUtils
 import org.apache.http.client.methods.HttpGet
-import org.apache.sshd.server.Command
+import org.apache.sshd.server.command.Command
 import org.slf4j.LoggerFactory
 import play.twirl.api.Html
 
diff --git a/src/main/scala/gitbucket/core/ssh/GitCommand.scala b/src/main/scala/gitbucket/core/ssh/GitCommand.scala
index 8380e94e3..b997f65c0 100644
--- a/src/main/scala/gitbucket/core/ssh/GitCommand.scala
+++ b/src/main/scala/gitbucket/core/ssh/GitCommand.scala
@@ -5,7 +5,8 @@ import gitbucket.core.plugin.{GitRepositoryRouting, PluginRegistry}
 import gitbucket.core.service.{AccountService, DeployKeyService, RepositoryService, SystemSettingsService}
 import gitbucket.core.servlet.{CommitLogHook, Database}
 import gitbucket.core.util.{SyntaxSugars, Directory}
-import org.apache.sshd.server.{Command, CommandFactory, Environment, ExitCallback, SessionAware}
+import org.apache.sshd.server.{Environment, ExitCallback, SessionAware}
+import org.apache.sshd.server.command.{Command, CommandFactory}
 import org.apache.sshd.server.session.ServerSession
 import org.slf4j.LoggerFactory
 import java.io.{File, InputStream, OutputStream}
diff --git a/src/main/scala/gitbucket/core/ssh/NoShell.scala b/src/main/scala/gitbucket/core/ssh/NoShell.scala
index 45130e460..b350e266d 100644
--- a/src/main/scala/gitbucket/core/ssh/NoShell.scala
+++ b/src/main/scala/gitbucket/core/ssh/NoShell.scala
@@ -2,7 +2,8 @@ package gitbucket.core.ssh
 
 import gitbucket.core.service.SystemSettingsService.SshAddress
 import org.apache.sshd.common.Factory
-import org.apache.sshd.server.{Environment, ExitCallback, Command}
+import org.apache.sshd.server.{Environment, ExitCallback}
+import org.apache.sshd.server.command.Command
 import java.io.{OutputStream, InputStream}
 import org.eclipse.jgit.lib.Constants