From cbfaa90a93b31b6b9b23e39c30b11210dcba8f1a Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sun, 9 Mar 2014 14:57:41 +0100 Subject: [PATCH] Bump netty.io to 4.0.17.Final Change-Id: I0f8c3d6ec41561c9c85cba5f36119a0f1b635347 Signed-off-by: Robert Varga --- opendaylight/commons/opendaylight/pom.xml | 2 +- .../opendaylight/src/main/resources/configuration/config.ini | 2 +- .../controller/test/sal/binding/it/AbstractTest.java | 2 ++ .../opendaylight/controller/sample/toaster/it/ToasterTest.java | 1 + opendaylight/md-sal/test/sal-rest-connector-it/pom.xml | 2 +- .../controller/netconf/it/pax/IdentityRefNetconfTest.java | 2 ++ opendaylight/netconf/pom.xml | 1 - 7 files changed, 8 insertions(+), 4 deletions(-) diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml index e05059b4ae..e7c7bbe637 100644 --- a/opendaylight/commons/opendaylight/pom.xml +++ b/opendaylight/commons/opendaylight/pom.xml @@ -91,7 +91,7 @@ 0.1.2-SNAPSHOT 0.5.2-SNAPSHOT 0.5.0-SNAPSHOT - 4.0.10.Final + 4.0.17.Final 2.4 0.4.2-SNAPSHOT 0.4.2-SNAPSHOT diff --git a/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini b/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini index 0d223b8df2..4598bac593 100644 --- a/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini +++ b/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini @@ -49,7 +49,7 @@ netconf.config.persister.2.properties.numberOfBackups=1 # Set Default start level for framework osgi.bundles.defaultStartLevel=4 # Extra packages to import from the boot class loader -org.osgi.framework.system.packages.extra=sun.reflect,sun.reflect.misc,sun.misc +org.osgi.framework.system.packages.extra=sun.reflect,sun.reflect.misc,sun.misc,sun.nio.ch # This is not Eclipse App eclipse.ignoreApp=true # Don't shutdown equinox if the eclipse App has ended, diff --git a/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/AbstractTest.java b/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/AbstractTest.java index 9ac94e7b89..019fc0eb73 100644 --- a/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/AbstractTest.java +++ b/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/AbstractTest.java @@ -25,6 +25,7 @@ import static org.opendaylight.controller.test.sal.binding.it.TestHelper.junitAn import static org.opendaylight.controller.test.sal.binding.it.TestHelper.mdSalCoreBundles; import static org.ops4j.pax.exam.CoreOptions.mavenBundle; import static org.ops4j.pax.exam.CoreOptions.options; +import static org.ops4j.pax.exam.CoreOptions.systemPackages; import static org.ops4j.pax.exam.CoreOptions.systemProperty; @RunWith(PaxExam.class) @@ -70,6 +71,7 @@ public abstract class AbstractTest { mavenBundle("ch.qos.logback", "logback-core").versionAsInProject(), // mavenBundle("ch.qos.logback", "logback-classic").versionAsInProject(), // systemProperty("osgi.bundles.defaultStartLevel").value("4"), + systemPackages("sun.nio.ch"), mdSalCoreBundles(), diff --git a/opendaylight/md-sal/samples/toaster-it/src/test/java/org/opendaylight/controller/sample/toaster/it/ToasterTest.java b/opendaylight/md-sal/samples/toaster-it/src/test/java/org/opendaylight/controller/sample/toaster/it/ToasterTest.java index 38a4dd4661..000783bd07 100644 --- a/opendaylight/md-sal/samples/toaster-it/src/test/java/org/opendaylight/controller/sample/toaster/it/ToasterTest.java +++ b/opendaylight/md-sal/samples/toaster-it/src/test/java/org/opendaylight/controller/sample/toaster/it/ToasterTest.java @@ -52,6 +52,7 @@ public class ToasterTest { mavenBundle("ch.qos.logback", "logback-core").versionAsInProject(), // mavenBundle("ch.qos.logback", "logback-classic").versionAsInProject(), // systemProperty("osgi.bundles.defaultStartLevel").value("4"), + systemPackages("sun.nio.ch"), toasterBundles(), mdSalCoreBundles(), diff --git a/opendaylight/md-sal/test/sal-rest-connector-it/pom.xml b/opendaylight/md-sal/test/sal-rest-connector-it/pom.xml index 15fee781ef..a9fc739456 100644 --- a/opendaylight/md-sal/test/sal-rest-connector-it/pom.xml +++ b/opendaylight/md-sal/test/sal-rest-connector-it/pom.xml @@ -136,7 +136,7 @@ io.netty netty-all - 4.0.10.Final + ${netty.version} test diff --git a/opendaylight/netconf/netconf-it/src/test/java/org/opendaylight/controller/netconf/it/pax/IdentityRefNetconfTest.java b/opendaylight/netconf/netconf-it/src/test/java/org/opendaylight/controller/netconf/it/pax/IdentityRefNetconfTest.java index 5fd9f2fcd1..ee971a65dd 100644 --- a/opendaylight/netconf/netconf-it/src/test/java/org/opendaylight/controller/netconf/it/pax/IdentityRefNetconfTest.java +++ b/opendaylight/netconf/netconf-it/src/test/java/org/opendaylight/controller/netconf/it/pax/IdentityRefNetconfTest.java @@ -44,6 +44,7 @@ import static org.opendaylight.controller.test.sal.binding.it.TestHelper.junitAn import static org.opendaylight.controller.test.sal.binding.it.TestHelper.mdSalCoreBundles; import static org.ops4j.pax.exam.CoreOptions.mavenBundle; import static org.ops4j.pax.exam.CoreOptions.options; +import static org.ops4j.pax.exam.CoreOptions.systemPackages; import static org.ops4j.pax.exam.CoreOptions.systemProperty; @RunWith(PaxExam.class) @@ -62,6 +63,7 @@ public class IdentityRefNetconfTest { systemProperty("osgi.console").value("2401"), systemProperty("osgi.bundles.defaultStartLevel").value("4"), systemProperty("pax.exam.osgi.unresolved.fail").value("true"), + systemPackages("sun.nio.ch"), testingModules(), loggingModules(), diff --git a/opendaylight/netconf/pom.xml b/opendaylight/netconf/pom.xml index e7b9a02552..586366f41a 100644 --- a/opendaylight/netconf/pom.xml +++ b/opendaylight/netconf/pom.xml @@ -47,7 +47,6 @@ 5.0.0 2.4.0 1.7.2 - 4.0.10.Final ${project.build.directory}/generated-sources/sal -- 2.36.6