diff --git a/datavault-broker/src/test/java/org/datavaultplatform/broker/services/UserKeyPairServiceOpenSSH8pt8IT.java b/datavault-broker/src/test/java/org/datavaultplatform/broker/services/UserKeyPairServiceOpenSSH8pt8IT.java index a9057318c..191fe9a37 100644 --- a/datavault-broker/src/test/java/org/datavaultplatform/broker/services/UserKeyPairServiceOpenSSH8pt8IT.java +++ b/datavault-broker/src/test/java/org/datavaultplatform/broker/services/UserKeyPairServiceOpenSSH8pt8IT.java @@ -5,8 +5,8 @@ import org.testcontainers.utility.DockerImageName; /** - * This test that we CANNOT use an 'ssh-rsa' KeyPair get make an SSH/SFTP connection - * to a server running OpenSSH 8.8 + * This test that we CAN use an 'ssh-rsa' KeyPair get make an SSH/SFTP connection + * to a server running OpenSSH 8.8 when we use NEW (non-jcraft) JSCH !!! */ @Slf4j public class UserKeyPairServiceOpenSSH8pt8IT extends BaseUserKeyPairServiceOpenSSHTest { @@ -19,7 +19,7 @@ public DockerImageName getDockerImageForOpenSSH() { @Override public boolean isSuccessExpected() { - return false; + return true; } } diff --git a/datavault-broker/src/test/java/org/datavaultplatform/common/storage/BaseSFTPFileSystemUsernamePasswordIT.java b/datavault-broker/src/test/java/org/datavaultplatform/common/storage/BaseSFTPFileSystemUsernamePasswordIT.java index fa62e4897..b04a95ca2 100644 --- a/datavault-broker/src/test/java/org/datavaultplatform/common/storage/BaseSFTPFileSystemUsernamePasswordIT.java +++ b/datavault-broker/src/test/java/org/datavaultplatform/common/storage/BaseSFTPFileSystemUsernamePasswordIT.java @@ -17,7 +17,7 @@ public abstract class BaseSFTPFileSystemUsernamePasswordIT extends BaseSFTPFileS static GenericContainer initialiseContainer(String tcName) { - return new GenericContainer<>(DockerImage.OPEN_SSH_9pt0_IMAGE_NAME) + return new GenericContainer<>(DockerImage.OPEN_SSH_9pt7_IMAGE_NAME) .withEnv("TC_NAME", tcName) .withEnv(ENV_USER_NAME, TEST_USER) .withEnv(ENV_PASSWORD, TEST_PASSWORD) diff --git a/datavault-common/pom.xml b/datavault-common/pom.xml index 73bb2fd2d..990ab6191 100644 --- a/datavault-common/pom.xml +++ b/datavault-common/pom.xml @@ -82,7 +82,7 @@ - com.jcraft + com.github.mwiede jsch diff --git a/datavault-common/src/test/java/org/datavaultplatform/common/docker/DockerImage.java b/datavault-common/src/test/java/org/datavaultplatform/common/docker/DockerImage.java index f0f20b312..bc18c2202 100644 --- a/datavault-common/src/test/java/org/datavaultplatform/common/docker/DockerImage.java +++ b/datavault-common/src/test/java/org/datavaultplatform/common/docker/DockerImage.java @@ -20,10 +20,10 @@ public abstract class DockerImage { // https://hub.docker.com/r/linuxserver/openssh-server/tags public static final String OPEN_SSH_8pt6_IMAGE_NAME = "linuxserver/openssh-server:version-8.6_p1-r3"; - //8.8 is when they removed sha-1 signature of ssh-rsa keys - causing problems with JSch + //8.8 is when they removed sha-1 signature of ssh-rsa keys - causing problems with 'OLD' (jcraft) JSch 0.1.55 Sftp Driver public static final String OPEN_SSH_8pt8_IMAGE_NAME = "linuxserver/openssh-server:version-8.8_p1-r1"; - public static final String OPEN_SSH_9pt0_IMAGE_NAME = "linuxserver/openssh-server:version-9.0_p1-r2"; + public static final String OPEN_SSH_9pt7_IMAGE_NAME = "linuxserver/openssh-server:version-9.7_p1-r4"; public static final String OPEN_SSH_IMAGE_NAME = OPEN_SSH_8pt8_IMAGE_NAME; public static final DockerImageName OPEN_SSH_IMAGE = parse(OPEN_SSH_IMAGE_NAME); diff --git a/pom.xml b/pom.xml index df877d906..378e9fe57 100644 --- a/pom.xml +++ b/pom.xml @@ -138,8 +138,8 @@ 2.4.0 - - 0.1.55 + + 0.2.18 5.2.0 @@ -284,9 +284,9 @@ ${apache.directory.api.version} - com.jcraft + com.github.mwiede jsch - ${jcraft.jsch.version} + ${jsch.version} net.sf.supercsv