From: Stephen Kitt <skitt@redhat.com>
Date: Wed, 29 Jun 2016 09:23:35 +0000 (+0200)
Subject: Prepare upgrade to Netty 4.1
X-Git-Tag: release/carbon~86^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=64dd1cb987f47c929f831d4e478758ce5ccbafad;hp=74a1f4cbbab1dbb405c81d55a4aa165914bcd7c9;p=netconf.git

Prepare upgrade to Netty 4.1

We need to widen the range of allowed versions for odl-netty.

Change-Id: I425f1464f9e97d15e69622701805376da53f6611
Signed-off-by: Stephen Kitt <skitt@redhat.com>
---

diff --git a/features/netconf/src/main/features/features.xml b/features/netconf/src/main/features/features.xml
index cdf0a6362a..29e9400108 100644
--- 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 ebe8cff7ff..77c9687fba 100644
--- 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>