(#97) - Update Jsch implementation

jcabi · Sep 26, 2022 · 961df00 · 961df00
1 parent b9d5d1d
commit 961df00
Show file tree

Hide file tree

Showing 11 changed files with 245 additions and 477 deletions.
diff --git a/pom.xml b/pom.xml
@@ -33,7 +33,7 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
   <parent>
     <groupId>com.jcabi</groupId>
     <artifactId>jcabi</artifactId>
-    <version>1.33.0</version>
+    <version>1.34.1</version>
   </parent>
   <artifactId>jcabi-ssh</artifactId>
   <version>2.0-SNAPSHOT</version>
@@ -75,11 +75,6 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
       <artifactId>jcabi-log</artifactId>
       <version>0.21.0</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-      <version>3.12.0</version>
-    </dependency>
     <dependency>
       <groupId>org.cactoos</groupId>
       <artifactId>cactoos</artifactId>
@@ -92,9 +87,9 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.jcraft</groupId>
+      <groupId>com.github.mwiede</groupId>
       <artifactId>jsch</artifactId>
-      <version>0.1.55</version>
+      <version>0.2.4</version>
     </dependency>
     <dependency>
       <groupId>org.apache.sshd</groupId>
@@ -120,6 +115,29 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
       <version>1.2.17</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.testcontainers</groupId>
+      <artifactId>testcontainers</artifactId>
+      <version>1.16.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.testcontainers</groupId>
+      <artifactId>junit-jupiter</artifactId>
+      <version>1.16.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-core</artifactId>
+      <version>1.3</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
@@ -131,14 +149,6 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
               <goal>integration-test</goal>
               <goal>verify</goal>
             </goals>
-            <configuration>
-              <systemProperties>
-                <failsafe.host>${failsafe.ssh.host}</failsafe.host>
-                <failsafe.port>${failsafe.ssh.port}</failsafe.port>
-                <failsafe.login>${failsafe.ssh.login}</failsafe.login>
-                <failsafe.key>${failsafe.ssh.key}</failsafe.key>
-              </systemProperties>
-            </configuration>
           </execution>
         </executions>
       </plugin>
@@ -152,7 +162,7 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
           <plugin>
             <groupId>com.qulice</groupId>
             <artifactId>qulice-maven-plugin</artifactId>
-            <version>0.21.1</version>
+            <version>0.22.0</version>
             <configuration>
               <excludes combine.children="append">
                 <exclude>findbugs:.*</exclude>

diff --git a/src/main/java/com/jcabi/ssh/Sshd.java b/src/main/java/com/jcabi/ssh/Sshd.java
diff --git a/src/main/resources/com/jcabi/ssh/authorized_keys b/src/main/resources/com/jcabi/ssh/authorized_keys
diff --git a/src/main/resources/com/jcabi/ssh/id_rsa b/src/main/resources/com/jcabi/ssh/id_rsa
diff --git a/src/main/resources/com/jcabi/ssh/ssh_host_rsa_key b/src/main/resources/com/jcabi/ssh/ssh_host_rsa_key
diff --git a/src/test/java/com/jcabi/ssh/ExecutionTest.java b/src/test/java/com/jcabi/ssh/ExecutionTest.java
@@ -42,15 +42,15 @@
  * Unit tests for {@link Execution}.
  * @since 1.4
  */
-public final class ExecutionTest {
+final class ExecutionTest {
 
     /**
      * Exit code expected from a command.
      */
     public static final int EXIT_CODE = 127;
 
     @Test
-    public void executesCommand() throws Exception {
+    void executesCommand() throws Exception {
         final Session session = Mockito.mock(Session.class);
         final ChannelExec channel = Mockito.mock(ChannelExec.class);
         Mockito.when(session.openChannel(Mockito.anyString()))