From 6fdc78f1efc0e9498a4cc700a21a713063bce061 Mon Sep 17 00:00:00 2001 From: Michal Rehak Date: Fri, 28 Mar 2014 08:01:45 -0700 Subject: [PATCH] fixed IT after netty version bump - we need access to sun.nio.ch - netty is needed before protocol-framework - netty bundles internal order changed Change-Id: I2ac25af6a559d935a733d8d28f05d95539ddc00b Signed-off-by: Michal Rehak --- .../controller/test/sal/binding/it/TestHelper.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java b/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java index 0a71ef5315..ba639ad7c2 100644 --- a/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java +++ b/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java @@ -45,6 +45,13 @@ public class TestHelper { bindingAwareSalBundles(), mavenBundle("commons-codec", "commons-codec").versionAsInProject(), + systemProperty("org.osgi.framework.system.packages.extra").value("sun.nio.ch"), + 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, "protocol-framework").versionAsInProject(), // mavenBundle(CONTROLLER, "config-manager").versionAsInProject(), // // mavenBundle("commons-io", "commons-io").versionAsInProject(), // @@ -64,12 +71,6 @@ public class TestHelper { mavenBundle(CONTROLLER, "config-persister-impl").versionAsInProject(), // - mavenBundle("io.netty", "netty-handler").versionAsInProject(), // - mavenBundle("io.netty", "netty-codec").versionAsInProject(), // - mavenBundle("io.netty", "netty-buffer").versionAsInProject(), // - mavenBundle("io.netty", "netty-transport").versionAsInProject(), // - mavenBundle("io.netty", "netty-common").versionAsInProject(), // - mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.xerces", "2.11.0_1"), mavenBundle("org.eclipse.birt.runtime.3_7_1", "org.apache.xml.resolver", "1.2.0"), -- 2.36.6