commit 5dc9a4e5ce737df192d0c7725d405b81dd28fb7c
author Jonathan Hart <jono@onlab.us> Fri Jan 13 09:09:57 2017 -0800
committer Ray Milkey <ray@onlab.us> Fri Jan 20 20:31:57 2017 +0000
tree 8d9c4724260efed28a0867185ca1dddea50109a8
parent 10bd8d11fafeeeccc4a1bf966b826c124d7e48f4

Bumping netty dependency versions to 4.1.5.Final.

Including test fixes.

Few more places referencing atomix version

Change-Id: I48fb8fa255624a86ae12117845603f7d53f1c29e

lib/pom.xml

diff --git a/lib/pom.xml b/lib/pom.xml
index 49bda35..c2643e3 100644
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -41,7 +41,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <onos-build-conf.version>1.3</onos-build-conf.version>
-        <netty4.version>4.0.40.Final</netty4.version>
+        <netty4.version>4.1.5.Final</netty4.version>
         <openflowj.version>0.9.7.onos</openflowj.version>
         <onos-maven-plugin.version>1.10</onos-maven-plugin.version>
         <osgi.version>5.0.0</osgi.version>
@@ -328,6 +328,12 @@
             </dependency>
 
             <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-resolver</artifactId>
+                <version>${netty4.version}</version>
+            </dependency>
+
+            <dependency>
                 <groupId>joda-time</groupId>
                 <artifactId>joda-time</artifactId>
                 <version>2.9.3</version>