Bug 558867 - Update console.ssh to use sshd.osgi 2.2I20200110-1805

Migrate osgi metadata.

Change-Id: I2980a4709e156f68210dcaa6f6f6c35bfd5ed127
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>

3 files changed, 14 insertions, 28 deletions

diff --git a/bundles/org.eclipse.equinox.console.jaas.fragment/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.console.jaas.fragment/META-INF/MANIFEST.MF
index de5a624f6..40f1da0e7 100755
--- a/bundles/org.eclipse.equinox.console.jaas.fragment/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.console.jaas.fragment/META-INF/MANIFEST.MF
@@ -7,5 +7,5 @@ Bundle-SymbolicName: org.eclipse.equinox.console.jaas.fragment
 Bundle-Version: 1.0.200.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 DynamicImport-Package: org.eclipse.equinox.console.jaas
-Fragment-Host: org.apache.sshd.core;bundle-version="0.5.0"
+Fragment-Host: org.apache.sshd.osgi;bundle-version="2.2.0"
 Automatic-Module-Name: org.eclipse.equinox.console.jaas.fragment
diff --git a/bundles/org.eclipse.equinox.console.ssh/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.console.ssh/META-INF/MANIFEST.MF
index e23ad447f..47d889ae6 100644
--- a/bundles/org.eclipse.equinox.console.ssh/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.console.ssh/META-INF/MANIFEST.MF
@@ -13,17 +13,17 @@ Import-Package: javax.security.auth;resolution:=optional,
  javax.security.auth.login;resolution:=optional,
  javax.security.auth.spi;resolution:=optional,
  org.apache.felix.service.command;status=provisional;version="0.8.0",
- org.apache.sshd.common;version="2.0.0";resolution:=optional,
- org.apache.sshd.common.kex;version="2.0.0";resolution:=optional,
- org.apache.sshd.common.keyprovider;version="2.0.0";resolution:=optional,
- org.apache.sshd.server;version="2.0.0";resolution:=optional,
- org.apache.sshd.server.auth;version="2.0.0";resolution:=optional,
- org.apache.sshd.server.auth.password;version="2.0.0";resolution:=optional,
- org.apache.sshd.server.auth.pubkey;version="2.0.0";resolution:=optional,
- org.apache.sshd.server.command;version="2.0.0";resolution:=optional,
- org.apache.sshd.server.jaas;version="2.0.0";resolution:=optional,
- org.apache.sshd.server.keyprovider;version="2.0.0";resolution:=optional,
- org.apache.sshd.server.session;version="2.0.0";resolution:=optional,
+ org.apache.sshd.common;version="2.2.0";resolution:=optional,
+ org.apache.sshd.common.kex;version="2.2.0";resolution:=optional,
+ org.apache.sshd.common.keyprovider;version="2.2.0";resolution:=optional,
+ org.apache.sshd.server;version="2.2.0";resolution:=optional,
+ org.apache.sshd.server.auth;version="2.2.0";resolution:=optional,
+ org.apache.sshd.server.auth.password;version="2.2.0";resolution:=optional,
+ org.apache.sshd.server.auth.pubkey;version="2.2.0";resolution:=optional,
+ org.apache.sshd.server.command;version="2.2.0";resolution:=optional,
+ org.apache.sshd.server.jaas;version="2.2.0";resolution:=optional,
+ org.apache.sshd.server.keyprovider;version="2.2.0";resolution:=optional,
+ org.apache.sshd.server.session;version="2.2.0";resolution:=optional,
  org.eclipse.equinox.console.common,
  org.eclipse.equinox.console.common.terminal,
  org.osgi.framework,
diff --git a/features/org.eclipse.equinox.core.sdk/feature.xml b/features/org.eclipse.equinox.core.sdk/feature.xml
index 8e9940e76..34a9cb534 100644
--- a/features/org.eclipse.equinox.core.sdk/feature.xml
+++ b/features/org.eclipse.equinox.core.sdk/feature.xml
@@ -380,28 +380,14 @@
          unpack="false"/>
 
    <plugin
-         id="org.apache.mina.core"
+         id="org.apache.sshd.osgi"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.apache.mina.core.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.sshd.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.sshd.core.source"
+         id="org.apache.sshd.osgi.source"
          download-size="0"
          install-size="0"
          version="0.0.0"