commit 7947be9b87e70709ce5295ebd31fa72b68ed18b2
author Jonathan Hart <jono@onlab.us> Fri Jan 13 09:09:57 2017 -0800
committer Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> Fri Jan 13 10:15:54 2017 -0800
tree 256a14e2a8257a56dea6a51025c070b39f1addf3
parent cfb5a99d42c72085b045671c7afe9d2a2bcbe93d

Bumping netty dependency versions to 4.1.5.Final.

Including test fixes.

Few more places referencing atomix version

Change-Id: I48fb8fa255624a86ae12117845603f7d53f1c29e

core/store/dist/BUCK

diff --git a/core/store/dist/BUCK b/core/store/dist/BUCK
index b5db3b8..0e4731e 100644
--- a/core/store/dist/BUCK
+++ b/core/store/dist/BUCK
@@ -8,6 +8,7 @@
     '//lib:netty-buffer',
     '//lib:netty-handler',
     '//lib:netty-transport-native-epoll',
+    '//lib:netty-resolver',
     '//lib:commons-math3',
     '//incubator/api:onos-incubator-api',
 ]

core/store/dist/pom.xml

diff --git a/core/store/dist/pom.xml b/core/store/dist/pom.xml
index 297c0ba..43e4f0c 100644
--- a/core/store/dist/pom.xml
+++ b/core/store/dist/pom.xml
@@ -100,20 +100,28 @@
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-transport</artifactId>
+            <version>${netty4.version}</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-codec</artifactId>
+            <version>${netty4.version}</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-handler</artifactId>
+            <version>${netty4.version}</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-transport-native-epoll</artifactId>
             <version>${netty4.version}</version>
         </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-resolver</artifactId>
+            <version>${netty4.version}</version>
+        </dependency>
     </dependencies>
 
 </project>

core/store/primitives/BUCK

diff --git a/core/store/primitives/BUCK b/core/store/primitives/BUCK
index 6fa9630..0758c3e 100644
--- a/core/store/primitives/BUCK
+++ b/core/store/primitives/BUCK
@@ -14,6 +14,7 @@
     '//lib:netty-handler',
     '//lib:netty-buffer',
     '//lib:netty-codec',
+    '//lib:netty-resolver',
 
 ]
 

core/store/primitives/pom.xml

diff --git a/core/store/primitives/pom.xml b/core/store/primitives/pom.xml
index e46328f..dd17462 100644
--- a/core/store/primitives/pom.xml
+++ b/core/store/primitives/pom.xml
@@ -76,12 +76,12 @@
         <dependency>
             <groupId>io.atomix.catalyst</groupId>
             <artifactId>catalyst-netty</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.2</version>
         </dependency>
         <dependency>
             <groupId>io.atomix.catalyst</groupId>
             <artifactId>catalyst-transport</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.2</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>