Merge "Prepare upgrade to Netty 4.1"

diff --git a/features/netconf/src/main/features/features.xml b/features/netconf/src/main/features/features.xml
index cdf0a6362a1b670b8005a0678e85061a04475b88..29e9400108a8790ac7786fbfc6e2d3bbd1fa2ec0 100644 (file)
--- a/features/netconf/src/main/features/features.xml
+++ b/features/netconf/src/main/features/features.xml
@@ -79,7 +79,7 @@
     <feature version='${project.version}'>odl-netconf-api</feature>
     <feature version='${project.version}'>odl-netconf-mapping-api</feature>
     <feature version='${project.version}'>odl-netconf-util</feature>
-    <feature version='[4.0.30,4.1.0)'>odl-netty</feature>
+    <feature version='[4.0.30,5.0.0)'>odl-netty</feature>
     <bundle>mvn:org.opendaylight.netconf/netconf-netty-util/{{VERSION}}</bundle>
     <bundle>mvn:org.bouncycastle/bcpkix-jdk15on/{{VERSION}}</bundle>
     <bundle>mvn:org.bouncycastle/bcprov-jdk15on/{{VERSION}}</bundle>

diff --git a/features/restconf/src/main/features/features.xml b/features/restconf/src/main/features/features.xml
index ebe8cff7ff45369e32a19df8935b856457bf2e4e..77c9687fba7862f018b8cea43830cc1b9688c8e5 100644 (file)
--- a/features/restconf/src/main/features/features.xml
+++ b/features/restconf/src/main/features/features.xml
@@ -28,7 +28,7 @@
     <feature name='odl-restconf-noauth' version='${project.version}' description="OpenDaylight :: Restconf">
         <feature version='${aaa.version}'>odl-aaa-shiro</feature>
         <feature version='${controller.mdsal.version}'>odl-mdsal-broker</feature>
-        <feature version='[4.0.30,4.1.0)'>odl-netty</feature>
+        <feature version='[4.0.30,5.0.0)'>odl-netty</feature>
         <feature>war</feature>
         <bundle>mvn:org.opendaylight.netconf/ietf-restconf/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.netconf/ietf-yang-library/{{VERSION}}</bundle>