Drop Felix Gogo

[openflowplugin.git] / openflowplugin-it / src / test / java / org / opendaylight / openflowplugin / openflow / md / it / OFPaxOptionsAssistant.java

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 3ed2a05f96639d7b4e0dd0b32bf0cd17151a1897..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;
@@ -68,7 +65,7 @@ public abstract class OFPaxOptionsAssistant {
      */
     public static Option ofLibraryBundles() {
         return new DefaultCompositeOption(
-                mavenBundle(OFLIBRARY, "util").versionAsInProject(),
+                mavenBundle(OFLIBRARY, "openflowjava-util").versionAsInProject(),
                 mavenBundle(OFLIBRARY, "openflow-protocol-impl").versionAsInProject(),
                 mavenBundle(OFLIBRARY, "openflow-protocol-api").versionAsInProject(),
                 mavenBundle(OFLIBRARY, "openflow-protocol-spi").versionAsInProject(),
@@ -96,7 +93,7 @@ public abstract class OFPaxOptionsAssistant {
                 mavenBundle(OFPLUGIN, "openflowplugin").versionAsInProject(),
                 mavenBundle(OFPLUGIN_APPS, "forwardingrules-manager").versionAsInProject(),
                 mavenBundle(OFPLUGIN_APPS, "inventory-manager").versionAsInProject(),
-                mavenBundle("org.openexi", "nagasena").versionAsInProject()
+                mavenBundle("openexi", "nagasena").versionAsInProject()
                 );
     }
 
@@ -118,9 +115,15 @@ public abstract class OFPaxOptionsAssistant {
         return new DefaultCompositeOption(
 //                mavenBundle("org.apache.felix", "org.apache.felix.dependencymanager").versionAsInProject(),
 //                mavenBundle(CONTROLLER, "sal").versionAsInProject(),
+                mavenBundle("io.netty", "netty-common").versionAsInProject(), //
+                mavenBundle("io.netty", "netty-buffer").versionAsInProject(), //
+                mavenBundle("io.netty", "netty-handler").versionAsInProject(), //
+                mavenBundle("io.netty", "netty-codec").versionAsInProject(), //
+                mavenBundle("io.netty", "netty-transport").versionAsInProject(), //
+
                 mavenBundle(CONTROLLER, "liblldp").versionAsInProject(),
                 mavenBundle(OFPLUGIN_APPS, "topology-lldp-discovery").versionAsInProject(),
-                mavenBundle(YANGTOOLS + ".thirdparty", "antlr4-runtime-osgi-nohead").versionAsInProject());
+                mavenBundle("org.antlr", "antlr4-runtime").versionAsInProject());
     }
 
     /**
@@ -131,8 +134,7 @@ public abstract class OFPaxOptionsAssistant {
                 TestHelper.junitAndMockitoBundles(),
                 TestHelper.mdSalCoreBundles(),
                 TestHelper.configMinumumBundles(),
-                mavenBundle(YANGTOOLS + ".thirdparty", "antlr4-runtime-osgi-nohead").versionAsInProject());
-
+                mavenBundle("org.antlr", "antlr4-runtime").versionAsInProject());
     }
 
     private static Option mdSalImplBundles() {