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

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 8cff6ad..64ad934 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 0c60c4c..6ae0cf6 100644
--- a/core/store/primitives/pom.xml
+++ b/core/store/primitives/pom.xml
@@ -70,18 +70,18 @@
         <dependency>
             <groupId>io.atomix</groupId>
             <artifactId>atomix</artifactId>
-            <version>1.0.0-rc9</version>
+            <version>1.0.0</version>
         </dependency>
 
         <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>