Update gogo versions to account for new karaf 3.0.3 constraints

Change-Id: Id062a95990a903873ab4b1f06408889f786f50fb
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/commons/integrationtest/pom.xml b/commons/integrationtest/pom.xml
index b4ed87bd9229d1fd6d97573005a5c9d7a6cf181a..b0d1ed83137cfb5cfb67d6150d72007e96371ea8 100644 (file)
--- a/commons/integrationtest/pom.xml
+++ b/commons/integrationtest/pom.xml
@@ -172,16 +172,19 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>javax.servlet.jsp</artifactId>
     </dependency>
     <dependency>
-      <groupId>equinoxSDK381</groupId>
+      <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.gogo.command</artifactId>
+      <version>0.14.0</version>
     </dependency>
     <dependency>
-      <groupId>equinoxSDK381</groupId>
+      <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.gogo.runtime</artifactId>
+      <version>0.12.1</version>
     </dependency>
     <dependency>
-      <groupId>equinoxSDK381</groupId>
+      <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.gogo.shell</artifactId>
+      <version>0.10.0</version>
     </dependency>
     <dependency>
       <groupId>equinoxSDK381</groupId>

diff --git a/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/ConfigurationBundles.java b/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/ConfigurationBundles.java
index 6e98e663869cef06c46231d7907180e1b9a563e2..262bea79965084c9b53e64ba00740875fd34b841 100644 (file)
--- a/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/ConfigurationBundles.java
+++ b/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/ConfigurationBundles.java
@@ -30,9 +30,9 @@ public class ConfigurationBundles {
                 mavenBundle("com.google.guava", "guava").versionAsInProject(),
                 mavenBundle("eclipselink", "javax.resource").versionAsInProject(),
                 mavenBundle("equinoxSDK381", "javax.servlet").versionAsInProject(),
-                mavenBundle("equinoxSDK381", "org.apache.felix.gogo.command").versionAsInProject(),
-                mavenBundle("equinoxSDK381", "org.apache.felix.gogo.runtime").versionAsInProject(),
-                mavenBundle("equinoxSDK381", "org.apache.felix.gogo.shell").versionAsInProject(),
+                mavenBundle("org.apache.felix", "org.apache.felix.gogo.command").versionAsInProject(),
+                mavenBundle("org.apache.felix", "org.apache.felix.gogo.runtime").versionAsInProject(),
+                mavenBundle("org.apache.felix", "org.apache.felix.gogo.shell").versionAsInProject(),
                 mavenBundle("equinoxSDK381", "org.eclipse.equinox.console").versionAsInProject(),
                 mavenBundle("equinoxSDK381", "org.eclipse.equinox.ds").versionAsInProject(),
                 mavenBundle("equinoxSDK381", "org.eclipse.equinox.util").versionAsInProject(),

diff --git a/plugin-shell/pom.xml b/plugin-shell/pom.xml
index dd610ac9c3939bf320d235a579e4d6c70758aab7..47e3eb652e0ea1628294a0b00b832552744cfd74 100644 (file)
--- a/plugin-shell/pom.xml
+++ b/plugin-shell/pom.xml
@@ -74,14 +74,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <artifactId>maven-bundle-plugin</artifactId>
         <version>2.4.0</version>
         <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Import-Package>org.apache.felix.service.command,
-              org.apache.karaf.shell.commands,
-              org.apache.karaf.shell.console,
-              *</Import-Package>
-          </instructions>
-        </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

diff --git a/plugin-shell/src/main/java/org/opendaylight/ovsdb/plugin/shell/PrintCache.java b/plugin-shell/src/main/java/org/opendaylight/ovsdb/plugin/shell/PrintCache.java
index 420f016c426876d58efd0644dfea31c23b4b145e..bdb718d4cf7b3e5e986f5afe3dec25aa488a74c5 100644 (file)
--- a/plugin-shell/src/main/java/org/opendaylight/ovsdb/plugin/shell/PrintCache.java
+++ b/plugin-shell/src/main/java/org/opendaylight/ovsdb/plugin/shell/PrintCache.java
@@ -9,8 +9,8 @@
  */
 package org.opendaylight.ovsdb.plugin.shell;
 
-import org.apache.felix.gogo.commands.Argument;
-import org.apache.felix.gogo.commands.Command;
+import org.apache.karaf.shell.commands.Argument;
+import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;
 import org.opendaylight.ovsdb.plugin.api.OvsdbInventoryService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;