Updates to console and rsa console bundles to use gogo 1.0.0 (photon

version)

Change-Id: I4473b4ebfcc77e433659a4b83bd8feb166d0de62

5 files changed, 10 insertions, 12 deletions

diff --git a/framework/bundles/org.eclipse.ecf.console/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.console/META-INF/MANIFEST.MF
index c13adc2f3..cd1898303 100644
--- a/framework/bundles/org.eclipse.ecf.console/META-INF/MANIFEST.MF
+++ b/framework/bundles/org.eclipse.ecf.console/META-INF/MANIFEST.MF
@@ -4,18 +4,17 @@ Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.ecf.console
 Automatic-Module-Name: org.eclipse.ecf.console
 Bundle-Vendor: %plugin.provider
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,
- J2SE-1.5
-Import-Package: org.eclipse.ecf.core;version="[3.0.0,4.0.0)",
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Import-Package: org.apache.felix.service.command;version="0.10.0",
+ org.eclipse.ecf.core;version="[3.0.0,4.0.0)",
  org.eclipse.ecf.core.identity;version="[3.0.0,4.0.0)",
  org.eclipse.ecf.core.util;version="[3.0.0,4.0.0)",
  org.osgi.framework;version="[1.3.0,2.0.0)",
  org.osgi.service.component.annotations;resolution:=optional,
  org.osgi.util.tracker;version="[1.3.0,2.0.0)"
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.0.0,4.0.0)",
- org.apache.felix.gogo.runtime;bundle-version="0.10.0"
+Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.0.0,4.0.0)"
 Service-Component: OSGI-INF/org.eclipse.ecf.internal.console.ContainerCommand.xml
 Export-Package: org.eclipse.ecf.console;version="1.0.0"
diff --git a/framework/bundles/org.eclipse.ecf.console/pom.xml b/framework/bundles/org.eclipse.ecf.console/pom.xml
index fba496e30..73fc8a69c 100644
--- a/framework/bundles/org.eclipse.ecf.console/pom.xml
+++ b/framework/bundles/org.eclipse.ecf.console/pom.xml
@@ -10,6 +10,6 @@
   </parent>
   <groupId>org.eclipse.ecf</groupId>
   <artifactId>org.eclipse.ecf.console</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/framework/bundles/org.eclipse.ecf.console/src/org/eclipse/ecf/console/AbstractCommand.java b/framework/bundles/org.eclipse.ecf.console/src/org/eclipse/ecf/console/AbstractCommand.java
index e8bedf051..214b40b80 100644
--- a/framework/bundles/org.eclipse.ecf.console/src/org/eclipse/ecf/console/AbstractCommand.java
+++ b/framework/bundles/org.eclipse.ecf.console/src/org/eclipse/ecf/console/AbstractCommand.java
@@ -12,7 +12,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Formatter;
 import java.util.List;
-
 import org.apache.felix.service.command.CommandSession;
 import org.apache.felix.service.command.Converter;
 import org.eclipse.ecf.core.ContainerTypeDescription;
diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/META-INF/MANIFEST.MF b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/META-INF/MANIFEST.MF
index dc6185f2f..cdf72be3c 100644
--- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/META-INF/MANIFEST.MF
+++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %bundle.name
 Bundle-SymbolicName: org.eclipse.ecf.osgi.services.remoteserviceadmin.console
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Vendor: %bundle.provider
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-Localization: bundle
 Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.ecf.console;version="[1.0.0,2.0.0)",
+Import-Package: org.apache.felix.service.command;version="0.10.0",
+ org.eclipse.ecf.console;version="[1.0.0,2.0.0)",
  org.eclipse.ecf.osgi.services.remoteserviceadmin;version="[1.3.0,2.0.0)",
  org.osgi.framework;version="1.8.0",
  org.osgi.service.component.annotations;version="[1.0.0,2.0.0)";resolution:=optional,
  org.osgi.service.remoteserviceadmin;version="[1.1.0,2.0.0)"
 Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.0.0,4.0.0)",
- org.apache.felix.gogo.runtime;bundle-version="0.10.0",
  org.eclipse.ecf;bundle-version="[3.8.0,4.0.0)"
 Service-Component: OSGI-INF/org.eclipse.ecf.osgi.services.remoteserviceadmin.console.RSACommand.xml
 
diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/pom.xml b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/pom.xml
index b08648a1a..e6f442a7b 100644
--- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/pom.xml
+++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/pom.xml
@@ -10,6 +10,6 @@
   </parent>
   <groupId>org.eclipse.ecf</groupId>
   <artifactId>org.eclipse.ecf.osgi.services.remoteserviceadmin.console</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>