Merge branch 'master' into issue850

hierynomus · Sep 1, 2023 · f493dec · f493dec
2 parents 23e7c4e + a5fdb29
commit f493dec
Show file tree

Hide file tree

Showing 32 changed files with 1,101 additions and 1,054 deletions.
diff --git a/README.adoc b/README.adoc
@@ -109,6 +109,7 @@ Fork away!
 
 == Release history
 SSHJ 0.36.0 (2023-07-18)::
+* Merged https://github.com/hierynomus/sshj/pull/861[#861]: Add DefaultSecurityProviderConfig with has BouncyCastle disabled
 * Merged https://github.com/hierynomus/sshj/pull/881[#881]: Rewrote test classes to JUnit Jupiter engine
 * Merged https://github.com/hierynomus/sshj/pull/880[#880]: Removed Java 7 backport Socket utilities
 * Merged https://github.com/hierynomus/sshj/pull/879[#879]: Replaced custom Base64 with java.util.Base64

diff --git a/build.gradle b/build.gradle
@@ -89,6 +89,7 @@ testing {
         implementation "org.slf4j:slf4j-api:2.0.7"
         implementation 'org.spockframework:spock-core:2.3-groovy-3.0'
         implementation "org.mockito:mockito-core:4.11.0"
+        implementation "org.assertj:assertj-core:3.24.2"
         implementation "ru.vyarus:spock-junit5:1.2.0"
         implementation "org.apache.sshd:sshd-core:$sshdVersion"
         implementation "org.apache.sshd:sshd-sftp:$sshdVersion"
@@ -101,6 +102,7 @@ testing {
         all {
           testTask.configure {
             testLogging {
+              showStandardStreams = false
               exceptionFormat = 'full'
             }
             include "**/*Test.*"
@@ -133,8 +135,8 @@ testing {
       }
 
       sources {
-        groovy {
-          srcDirs = ['src/itest/groovy']
+        java {
+          srcDirs = ['src/itest/java']
         }
 
         resources {

diff --git a/src/itest/docker-image/entrypoint.sh b/src/itest/docker-image/entrypoint.sh
@@ -0,0 +1,7 @@
+#!/bin/ash
+
+# generate host keys if not present
+ssh-keygen -A
+
+# do not detach (-D), log to stderr (-e), passthrough other arguments
+exec /usr/sbin/sshd -D -e "$@"
diff --git a/src/itest/groovy/com/hierynomus/sshj/IntegrationSpec.groovy b/src/itest/groovy/com/hierynomus/sshj/IntegrationSpec.groovy
diff --git a/src/itest/groovy/com/hierynomus/sshj/IntegrationTestUtil.groovy b/src/itest/groovy/com/hierynomus/sshj/IntegrationTestUtil.groovy
diff --git a/src/itest/groovy/com/hierynomus/sshj/ManyChannelsSpec.groovy b/src/itest/groovy/com/hierynomus/sshj/ManyChannelsSpec.groovy