Merge "Drop Felix Gogo" into stable/boron

diff --git a/openflowplugin-it/pom.xml b/openflowplugin-it/pom.xml
index f4d6b5c7094e5dfbb1d2d7ee119eac360f385b22..e7977b0e53579cff75b151127719582d4b51841d 100644 (file)
--- a/openflowplugin-it/pom.xml
+++ b/openflowplugin-it/pom.xml
@@ -157,21 +157,6 @@
           <artifactId>org.eclipse.equinox.console</artifactId>
           <scope>test</scope>
         </dependency>
-        <dependency>
-          <groupId>equinoxSDK381</groupId>
-          <artifactId>org.apache.felix.gogo.command</artifactId>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>equinoxSDK381</groupId>
-          <artifactId>org.apache.felix.gogo.runtime</artifactId>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>equinoxSDK381</groupId>
-          <artifactId>org.apache.felix.gogo.shell</artifactId>
-          <scope>test</scope>
-        </dependency>
         <dependency>
           <groupId>org.opendaylight.controller</groupId>
           <artifactId>logback-config</artifactId>

diff --git a/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/OFPaxOptionsAssistant.java b/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/OFPaxOptionsAssistant.java
index 8d3c01fb759c2561854ec1bcc1d866b455891b27..75c7f7ad8bd2521c62254ce562435de3249e7aa3 100644 (file)
--- a/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/OFPaxOptionsAssistant.java
+++ b/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/OFPaxOptionsAssistant.java
@@ -54,10 +54,7 @@ public abstract class OFPaxOptionsAssistant {
         if (System.getProperty(INSPECT_OSGI) != null) {
             option
             .add(CoreOptions.vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address="+DEBUG_PORT))
-            .add(CoreOptions.mavenBundle("equinoxSDK381", "org.eclipse.equinox.console").versionAsInProject())
-            .add(CoreOptions.mavenBundle("equinoxSDK381", "org.apache.felix.gogo.shell").versionAsInProject())
-            .add(CoreOptions.mavenBundle("equinoxSDK381", "org.apache.felix.gogo.runtime").versionAsInProject())
-            .add(CoreOptions.mavenBundle("equinoxSDK381", "org.apache.felix.gogo.command").versionAsInProject());
+            .add(CoreOptions.mavenBundle("equinoxSDK381", "org.eclipse.equinox.console").versionAsInProject()));
         }
 
         return option;