diff options
5 files changed, 14 insertions, 4 deletions
diff --git a/adaptors/ssh-adaptor/ssh-adaptor-bundle/pom.xml b/adaptors/ssh-adaptor/ssh-adaptor-bundle/pom.xml index 359ecade6..5661eed32 100644 --- a/adaptors/ssh-adaptor/ssh-adaptor-bundle/pom.xml +++ b/adaptors/ssh-adaptor/ssh-adaptor-bundle/pom.xml @@ -57,6 +57,16 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>org.apache.sshd</groupId> + <artifactId>sshd-scp</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.sshd</groupId> + <artifactId>sshd-sftp</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>dblib-provider</artifactId> </dependency> diff --git a/adaptors/ssh-adaptor/ssh-adaptor-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/ssh/sshd/SshConnectionSshd.java b/adaptors/ssh-adaptor/ssh-adaptor-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/ssh/sshd/SshConnectionSshd.java index 4194159fe..34b2aa8f5 100644 --- a/adaptors/ssh-adaptor/ssh-adaptor-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/ssh/sshd/SshConnectionSshd.java +++ b/adaptors/ssh-adaptor/ssh-adaptor-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/ssh/sshd/SshConnectionSshd.java @@ -93,7 +93,7 @@ class SshConnectionSshd implements SshConnection { } if (keyFile != null) { KeyPairProvider keyPairProvider = new FileKeyPairProvider(Paths.get(keyFile)); - KeyPair keyPair = keyPairProvider.loadKeys().iterator().next(); + KeyPair keyPair = keyPairProvider.loadKeys(clientSession).iterator().next(); clientSession.addPublicKeyIdentity(keyPair); } AuthFuture authFuture = clientSession.auth(); diff --git a/adaptors/ssh-adaptor/ssh-adaptor-bundle/src/test/java/org/onap/ccsdk/sli/adaptors/ssh/sshd/SshAdaptorTest.java b/adaptors/ssh-adaptor/ssh-adaptor-bundle/src/test/java/org/onap/ccsdk/sli/adaptors/ssh/sshd/SshAdaptorTest.java index 5067debd5..fecb42fc2 100644 --- a/adaptors/ssh-adaptor/ssh-adaptor-bundle/src/test/java/org/onap/ccsdk/sli/adaptors/ssh/sshd/SshAdaptorTest.java +++ b/adaptors/ssh-adaptor/ssh-adaptor-bundle/src/test/java/org/onap/ccsdk/sli/adaptors/ssh/sshd/SshAdaptorTest.java @@ -33,6 +33,7 @@ import java.nio.file.Paths; import java.util.Collections; import org.apache.sshd.common.util.OsUtils; import org.apache.sshd.server.SshServer; +import org.apache.sshd.server.ServerFactoryManager; import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider; import org.apache.sshd.server.scp.ScpCommandFactory; import org.apache.sshd.server.subsystem.sftp.SftpSubsystemFactory; @@ -216,7 +217,8 @@ public class SshAdaptorTest { sshd.setKeyPairProvider(new SimpleGeneratorHostKeyProvider(Paths.get(System.getProperty("java.io.tmpdir") + "/key.ser"))); sshd.setPasswordAuthenticator((username, password, session) -> (SSH_USERNAME.equals(username) && SSH_PASSWORD.equals(password))); sshd.setPublickeyAuthenticator((username, key, session) -> false); - sshd.getProperties().put(SshServer.WELCOME_BANNER, "Welcome to SSHD\n"); + // SshServer.WELCOME_BANNER no longer exists in apache sshd 2.7.0 + // sshd.getProperties().put(SshServer.WELCOME_BANNER, "Welcome to SSHD\n"); startServer0(); try { Thread.sleep(1000); diff --git a/core/features/ccsdk-dblib/pom.xml b/core/features/ccsdk-dblib/pom.xml index 313371b68..63a21c240 100644 --- a/core/features/ccsdk-dblib/pom.xml +++ b/core/features/ccsdk-dblib/pom.xml @@ -29,7 +29,6 @@ <dependency> <groupId>org.apache.tomcat</groupId> <artifactId>tomcat-jdbc</artifactId> - <version>9.0.30</version> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> diff --git a/core/features/ccsdk-dblib/src/main/feature/feature.xml b/core/features/ccsdk-dblib/src/main/feature/feature.xml index acb7a7399..f8f53a7ce 100644 --- a/core/features/ccsdk-dblib/src/main/feature/feature.xml +++ b/core/features/ccsdk-dblib/src/main/feature/feature.xml @@ -6,7 +6,6 @@ <feature prerequisite="true" dependency="false">wrap</feature> <bundle>mvn:org.onap.ccsdk.sli.core/dblib-provider/${project.version}</bundle> <bundle>wrap:mvn:org.apache.tomcat/tomcat-jdbc/${tomcat-jdbc.version}/$DynamicImport-Package=org.mariadb.*,org.apache.derby.*&overwrite=merge</bundle> - <bundle>wrap:mvn:org.apache.tomcat/tomcat-juli/${tomcat-jdbc.version}/$DynamicImport-Package=org.mariadb.*,org.apache.derby.*&overwrite=merge</bundle> <bundle>mvn:org.onap.ccsdk.sli.core/utils-provider/${project.version}</bundle> </feature> </features> |