Fix for paperspigot. Added bundled jline. Works with both spigot and paperspigot now.

pom.xml

@@ -6,14 +6,14 @@
 
     <groupId>com.ryanmichela</groupId>
     <artifactId>SSHD</artifactId>
-    <version>1.2</version>
+    <version>1.3.1</version>
     <url>http://dev.bukkit.org/server-mods/sshd/</url>
 
     <!-- Repositories -->
     <repositories>
         <repository>
-            <id>bukkit-repo</id>
-            <url>http://repo.bukkit.org/content/groups/public/</url>
+            <id>spigot-repo</id>
+            <url>https://hub.spigotmc.org/nexus/content/groups/public</url>
         </repository>
     </repositories>
 
@@ -30,27 +30,71 @@
         <dependency>
             <groupId>org.bukkit</groupId>
             <artifactId>craftbukkit</artifactId>
-            <version>1.7.9-R0.2</version>
-            <scope>provided</scope>
+            <version>1.12.2-R0.1-SNAPSHOT</version>
+            <scope>system</scope>
             <type>jar</type>
+            <systemPath>${basedir}/bukkit-build/bukkit.jar</systemPath>
         </dependency>
+
         <dependency>
             <groupId>org.apache.sshd</groupId>
             <artifactId>sshd-core</artifactId>
-            <version>0.9.0</version>
+            <version>1.6.0</version>
             <scope>compile</scope>
             <type>jar</type>
         </dependency>
+        
+        <dependency>
+            <groupId>org.apache.mina</groupId>
+            <artifactId>mina-core</artifactId>
+            <version>2.0.16</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.25</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jdk14</artifactId>
+            <version>1.7.25</version>
+        </dependency>
+
+        <dependency>
+            <groupId>jline</groupId>
+            <artifactId>jline</artifactId>
+            <version>2.12.1</version>
+        </dependency>
+
     </dependencies>
 
     <!-- Build -->
     <build>
         <plugins>
-            <!-- Shade plugin -->
             <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                </configuration>
+            </plugin>
+            
+            <!-- Shade plugin -->
+            <!-- <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>1.5</version>
+                <version>1.7</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -72,15 +116,16 @@
                     </filters>
                     <minimizeJar>true</minimizeJar>
                 </configuration>
-            </plugin>
+            </plugin>  -->
+            
             <!-- Compile plugin -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.0</version>
                 <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                     <showDeprecation>true</showDeprecation>
                 </configuration>
             </plugin>

src/main/java/com/ryanmichela/sshd/ConfigPasswordAuthenticator.java

@@ -1,6 +1,6 @@
 package com.ryanmichela.sshd;
 
-import org.apache.sshd.server.PasswordAuthenticator;
+import org.apache.sshd.server.auth.password.PasswordAuthenticator;
 import org.apache.sshd.server.session.ServerSession;
 
 import java.util.HashMap;

src/main/java/com/ryanmichela/sshd/ConsoleCommandCompleter.java

@@ -6,7 +6,7 @@ package com.ryanmichela.sshd;
 
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandMap;
-import org.bukkit.craftbukkit.libs.jline.console.completer.Completer;
+import jline.console.completer.Completer;
 
 import java.util.List;
 import java.util.concurrent.ExecutionException;

src/main/java/com/ryanmichela/sshd/ConsoleShellFactory.java

@@ -1,5 +1,6 @@
 package com.ryanmichela.sshd;
 
+import jline.console.ConsoleReader;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.core.Logger;
 import org.apache.sshd.common.Factory;
@@ -7,7 +8,6 @@ import org.apache.sshd.server.Command;
 import org.apache.sshd.server.Environment;
 import org.apache.sshd.server.ExitCallback;
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.libs.jline.console.ConsoleReader;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -15,6 +15,9 @@ import java.io.OutputStream;
 import java.util.logging.StreamHandler;
 
 public class ConsoleShellFactory implements Factory<Command> {
+    public Command get() {
+        return this.create();
+    }
 
     public Command create() {
         return new ConsoleShell();
@@ -89,17 +92,18 @@ public class ConsoleShellFactory implements Factory<Command> {
         }
 
         public void run() {
-            String command;
             try {
                 printPreamble(consoleReader);
-                while(true) {
-                    command = consoleReader.readLine("\r>", null);
+                while (true) {
+                    String command = consoleReader.readLine("\r>", null);
                     if (command != null) {
                         if (command.equals("exit")) {
                             break;
                         }
                         SshdPlugin.instance.getLogger().info("<" + environment.getEnv().get(Environment.ENV_USER) + "> " + command);
-                        Bukkit.dispatchCommand(Bukkit.getConsoleSender(), command);
+                        Bukkit.getScheduler().runTask(SshdPlugin.instance, () -> {
+                            Bukkit.dispatchCommand(Bukkit.getConsoleSender(), command);
+                        });
                     }
                 }
             } catch (IOException e) {
@@ -109,7 +113,7 @@ public class ConsoleShellFactory implements Factory<Command> {
             }
         }
 
-        private void printPreamble(ConsoleReader consoleReader) throws IOException{
+        private void printPreamble(ConsoleReader consoleReader) throws IOException {
             consoleReader.println("  _____ _____ _    _ _____");
             consoleReader.println(" / ____/ ____| |  | |  __ \\");
             consoleReader.println("| (___| (___ | |__| | |  | |");

src/main/java/com/ryanmichela/sshd/FlushyStreamHandler.java

@@ -1,7 +1,8 @@
 package com.ryanmichela.sshd;
 
 import org.apache.sshd.common.SshException;
-import org.bukkit.craftbukkit.libs.jline.console.ConsoleReader;
+import jline.console.ConsoleReader;
+
 
 import java.io.IOException;
 import java.io.OutputStream;

src/main/java/com/ryanmichela/sshd/PemDecoder.java

@@ -1,6 +1,6 @@
 package com.ryanmichela.sshd;
 
-import org.apache.mina.util.Base64;
+import org.apache.commons.codec.binary.Base64;
 
 import java.io.Reader;
 import java.math.BigInteger;
@@ -22,7 +22,7 @@ public class PemDecoder extends java.io.BufferedReader {
     }
 
     public PublicKey getPemBytes() throws Exception {
-        StringBuffer b64 = new StringBuffer();
+        StringBuilder b64 = new StringBuilder();
 
         String line = readLine();
         if (!line.matches(BEGIN)) {

src/main/java/com/ryanmichela/sshd/PublicKeyAuthenticator.java

@@ -1,7 +1,7 @@
 package com.ryanmichela.sshd;
 
 import org.apache.commons.lang.ArrayUtils;
-import org.apache.sshd.server.PublickeyAuthenticator;
+import org.apache.sshd.server.auth.pubkey.PublickeyAuthenticator;
 import org.apache.sshd.server.session.ServerSession;
 
 import java.io.File;

src/main/java/com/ryanmichela/sshd/ReflectionUtil.java

@@ -28,9 +28,7 @@ public class ReflectionUtil {
             modifiersField.setInt(f, f.getModifiers() & ~Modifier.FINAL);
 
             f.set(o, newValue);
-        } catch (NoSuchFieldException ex) {
-            System.out.println("*** " + c.getName() + ":" + ex);
-        } catch (IllegalAccessException ex) {
+        } catch (NoSuchFieldException | IllegalAccessException ex) {
             System.out.println("*** " + c.getName() + ":" + ex);
         }
     }

src/main/java/com/ryanmichela/sshd/SshTerminal.java

@@ -1,6 +1,6 @@
 package com.ryanmichela.sshd;
 
-import org.bukkit.craftbukkit.libs.jline.TerminalSupport;
+import jline.TerminalSupport;
 
 /**
  * Copyright 2013 Ryan Michela

src/main/java/com/ryanmichela/sshd/SshdPlugin.java

@@ -1,6 +1,6 @@
 package com.ryanmichela.sshd;
 
-import org.apache.sshd.SshServer;
+import org.apache.sshd.server.SshServer;
 import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider;
 import org.bukkit.plugin.java.JavaPlugin;
 
@@ -41,7 +41,7 @@ public class SshdPlugin extends JavaPlugin {
         File hostKey = new File(getDataFolder(), "hostkey");
         File authorizedKeys = new File(getDataFolder(), "authorized_keys");
 
-        sshd.setKeyPairProvider(new SimpleGeneratorHostKeyProvider(hostKey.getPath()));
+        sshd.setKeyPairProvider(new SimpleGeneratorHostKeyProvider(hostKey));
         sshd.setShellFactory(new ConsoleShellFactory());
         sshd.setPasswordAuthenticator(new ConfigPasswordAuthenticator());
         sshd.setPublickeyAuthenticator(new PublicKeyAuthenticator(authorizedKeys));

src/main/java/com/ryanmichela/sshd/StreamHandlerAppender.java

@@ -25,15 +25,18 @@ public class StreamHandlerAppender implements Appender {
     @Override
     public void append(LogEvent logEvent) {
         java.util.logging.Level level;
-        switch (logEvent.getLevel())
-        {
-            case DEBUG: level = java.util.logging.Level.FINE; break;
-            case INFO: level = java.util.logging.Level.INFO; break;
-            case WARN: level = java.util.logging.Level.WARNING; break;
-            case ERROR: level = java.util.logging.Level.SEVERE; break;
-            default: level = java.util.logging.Level.INFO; break;
-        }
 
+        if(logEvent.getLevel().equals(org.apache.logging.log4j.Level.DEBUG)) {
+            level = java.util.logging.Level.FINE;
+        } else if(logEvent.getLevel().equals(org.apache.logging.log4j.Level.INFO)) {
+            level = java.util.logging.Level.INFO;
+        } else if(logEvent.getLevel().equals(org.apache.logging.log4j.Level.WARN)) {
+            level = java.util.logging.Level.WARNING;
+        } else if(logEvent.getLevel().equals(org.apache.logging.log4j.Level.ERROR)) {
+            level = java.util.logging.Level.SEVERE;
+        } else {
+            level = java.util.logging.Level.INFO;
+        }
         String message = logEvent.getMessage().getFormattedMessage();
 
 
@@ -66,6 +69,16 @@ public class StreamHandlerAppender implements Appender {
 
     }
 
+    @Override
+    public State getState() {
+        return State.INITIALIZED;
+    }
+
+    @Override
+    public void initialize() {
+
+    }
+
     @Override
     public void start() {
 
@@ -80,4 +93,9 @@ public class StreamHandlerAppender implements Appender {
     public boolean isStarted() {
         return true;
     }
+
+    @Override
+    public boolean isStopped() {
+        return false;
+    }
 }

src/main/java/org/slf4j/impl/PluginSlf4jFactory.java

@@ -22,10 +22,7 @@ public class PluginSlf4jFactory implements ILoggerFactory {
         private String name;
 
         private boolean isEnabled(Level level) {
-            if (SshdPlugin.instance != null) {
-                return SshdPlugin.instance.getLogger().isLoggable(level);
-            }
-            return false;
+            return SshdPlugin.instance != null && SshdPlugin.instance.getLogger().isLoggable(level);
         }
 
         private void log(Level level, String s, Object[] objects) {