Alon Bar-Lev has uploaded a new change for review.
Change subject: host-deploy: upgrade to apache-sshd 0.11.0
......................................................................
host-deploy: upgrade to apache-sshd 0.11.0
Change-Id: I6943590f1c479e71633dcce1180028e06c9a9a17
Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
---
M backend/manager/dependencies/pom.xml
D backend/manager/dependencies/src/main/modules/org/apache/mina/main/module.xml
M backend/manager/dependencies/src/main/modules/org/apache/sshd/main/module.xml
M backend/manager/modules/utils/pom.xml
M
backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/SSHD.java
M ear/src/main/resources/META-INF/MANIFEST.MF
M ovirt-engine.spec.in
M pom.xml
8 files changed, 22 insertions(+), 47 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/77/26777/1
diff --git a/backend/manager/dependencies/pom.xml
b/backend/manager/dependencies/pom.xml
index 8468fac..9ef411e 100644
--- a/backend/manager/dependencies/pom.xml
+++ b/backend/manager/dependencies/pom.xml
@@ -46,12 +46,6 @@
</dependency>
<dependency>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-core</artifactId>
- <version>${mina-core.version}</version>
- </dependency>
-
- <dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-core</artifactId>
<version>${sshd-core.version}</version>
@@ -271,12 +265,6 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<moduleName>org.apache.commons.compress</moduleName>
- </module>
-
- <module>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-core</artifactId>
- <moduleName>org.apache.mina</moduleName>
</module>
<module>
diff --git
a/backend/manager/dependencies/src/main/modules/org/apache/mina/main/module.xml
b/backend/manager/dependencies/src/main/modules/org/apache/mina/main/module.xml
deleted file mode 100644
index b845207..0000000
---
a/backend/manager/dependencies/src/main/modules/org/apache/mina/main/module.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<module xmlns="urn:jboss:module:1.1" name="org.apache.mina">
-
- <resources>
- <resource-root path="mina-core.jar"/>
- </resources>
-
- <dependencies>
- <module name="javax.api"/>
- <module name="org.slf4j"/>
- </dependencies>
-
-</module>
diff --git
a/backend/manager/dependencies/src/main/modules/org/apache/sshd/main/module.xml
b/backend/manager/dependencies/src/main/modules/org/apache/sshd/main/module.xml
index 031edda..9d7e4f6 100644
---
a/backend/manager/dependencies/src/main/modules/org/apache/sshd/main/module.xml
+++
b/backend/manager/dependencies/src/main/modules/org/apache/sshd/main/module.xml
@@ -8,7 +8,6 @@
<dependencies>
<module name="javax.api"/>
- <module name="org.apache.mina"/>
<module name="org.slf4j"/>
</dependencies>
diff --git a/backend/manager/modules/utils/pom.xml
b/backend/manager/modules/utils/pom.xml
index daf3b1c..2c3cc19 100644
--- a/backend/manager/modules/utils/pom.xml
+++ b/backend/manager/modules/utils/pom.xml
@@ -30,12 +30,6 @@
</dependency>
<dependency>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-core</artifactId>
- <version>${mina-core.version}</version>
- </dependency>
-
- <dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-core</artifactId>
<version>${sshd-core.version}</version>
diff --git
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/SSHD.java
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/SSHD.java
index efbc70f..9064aaf 100644
---
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/SSHD.java
+++
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/SSHD.java
@@ -5,9 +5,11 @@
import java.security.KeyPairGenerator;
import java.security.NoSuchAlgorithmException;
import java.security.PublicKey;
+import java.util.LinkedList;
+import java.util.List;
import org.apache.sshd.SshServer;
-import org.apache.sshd.common.keyprovider.AbstractKeyPairProvider;
+import org.apache.sshd.common.KeyPairProvider;
import org.apache.sshd.server.Command;
import org.apache.sshd.server.CommandFactory;
import org.apache.sshd.server.PasswordAuthenticator;
@@ -47,7 +49,7 @@
}
}
- static class MyKeyPairProvider extends AbstractKeyPairProvider {
+ static class MyKeyPairProvider implements KeyPairProvider {
KeyPair _keyPair;
public MyKeyPairProvider(KeyPair keyPair) {
@@ -55,8 +57,21 @@
}
@Override
- protected KeyPair[] loadKeys() {
- return new KeyPair[] { _keyPair };
+ public KeyPair loadKey(String type) {
+ return _keyPair;
+ }
+
+ /* >=0.10 */
+ //@Override
+ public Iterable<KeyPair> loadKeys() {
+ List<KeyPair> ret = new LinkedList<>();
+ ret.add(_keyPair);
+ return ret;
+ }
+
+ @Override
+ public String getKeyTypes() {
+ return SSH_RSA;
}
}
diff --git a/ear/src/main/resources/META-INF/MANIFEST.MF
b/ear/src/main/resources/META-INF/MANIFEST.MF
index 28e6f0a..2271cc3 100644
--- a/ear/src/main/resources/META-INF/MANIFEST.MF
+++ b/ear/src/main/resources/META-INF/MANIFEST.MF
@@ -7,7 +7,6 @@
org.apache.commons.httpclient,
org.apache.commons.lang,
org.apache.log4j,
- org.apache.mina,
org.apache.xmlrpc,
org.codehaus.jackson.jackson-core-asl,
org.codehaus.jackson.jackson-mapper-asl,
diff --git a/ovirt-engine.spec.in b/ovirt-engine.spec.in
index 7d27a38..62578ba 100644
--- a/ovirt-engine.spec.in
+++ b/ovirt-engine.spec.in
@@ -186,7 +186,7 @@
Requires: apache-commons-compress
Requires: apache-commons-configuration
Requires: apache-commons-jxpath
-Requires: apache-sshd
+Requires: apache-sshd >= 0.11.0
Requires: jakarta-commons-httpclient
Requires: objectweb-asm
Requires: openstack-java-client >= %{openstack_java_version}
@@ -649,7 +649,7 @@
org/apache/commons/configuration/main/commons-configuration.jar
commons-configuration.jar
org/apache/commons/httpclient/main/commons-httpclient.jar
org/apache/commons/jxpath/main/commons-jxpath.jar commons-jxpath.jar
-org/apache/mina/main/mina-core.jar apache-mina/mina-core.jar
+org/apache/sshd/main/sshd-core.jar apache-sshd/sshd-core.jar
org/apache/xmlrpc/main/xmlrpc-client.jar
org/apache/xmlrpc/main/xmlrpc-common.jar
org/postgresql/main/postgresql.jar postgresql-jdbc.jar
diff --git a/pom.xml b/pom.xml
index 3a520b8..c169810 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,8 +68,7 @@
<jcraft.jsch.version>0.1.42</jcraft.jsch.version>
<dozer.version>5.2.0</dozer.version>
<cxf.version>2.2.7</cxf.version>
- <mina-core.version>2.0.1</mina-core.version>
- <sshd-core.version>0.7.0</sshd-core.version>
+ <sshd-core.version>0.11.0</sshd-core.version>
<otopi.version>1.2.0</otopi.version>
<ovirt-host-deploy.version>1.2.0</ovirt-host-deploy.version>
<org.ovirt.engine.api.ovirt-engine-extensions-api.version>0.0.0-SNAPSHOT</org.ovirt.engine.api.ovirt-engine-extensions-api.version>
@@ -226,11 +225,6 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>${commons-compress.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-core</artifactId>
- <version>${mina-core.version}</version>
</dependency>
<dependency>
<groupId>org.apache.sshd</groupId>
--
To view, visit http://gerrit.ovirt.org/26777
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6943590f1c479e71633dcce1180028e06c9a9a17
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
