diff --git a/lib/deps.json b/lib/deps.json
index 3d90531..aa77cc4 100644
--- a/lib/deps.json
+++ b/lib/deps.json
@@ -145,13 +145,13 @@
     "aopalliance-repackaged": "mvn:org.glassfish.hk2.external:aopalliance-repackaged:2.5.0-b42",
     "amqp-client": "mvn:com.rabbitmq:amqp-client:jar:3.6.1",
     "asm": "mvn:org.ow2.asm:asm:5.2",
-    "atomix": "mvn:io.atomix:atomix:3.1.0-rc1",
-    "atomix-cluster": "mvn:io.atomix:atomix-cluster:3.1.0-rc1",
-    "atomix-primary-backup": "mvn:io.atomix:atomix-primary-backup:3.1.0-rc1",
-    "atomix-primitive": "mvn:io.atomix:atomix-primitive:3.1.0-rc1",
-    "atomix-raft": "mvn:io.atomix:atomix-raft:3.1.0-rc1",
-    "atomix-storage": "mvn:io.atomix:atomix-storage:3.1.0-rc1",
-    "atomix-utils": "mvn:io.atomix:atomix-utils:3.1.0-rc1",
+    "atomix": "mvn:io.atomix:atomix:3.1.0-rc2",
+    "atomix-cluster": "mvn:io.atomix:atomix-cluster:3.1.0-rc2",
+    "atomix-primary-backup": "mvn:io.atomix:atomix-primary-backup:3.1.0-rc2",
+    "atomix-primitive": "mvn:io.atomix:atomix-primitive:3.1.0-rc2",
+    "atomix-raft": "mvn:io.atomix:atomix-raft:3.1.0-rc2",
+    "atomix-storage": "mvn:io.atomix:atomix-storage:3.1.0-rc2",
+    "atomix-utils": "mvn:io.atomix:atomix-utils:3.1.0-rc2",
     "classgraph": "mvn:io.github.classgraph:classgraph:4.2.3",
     "commons-codec": "mvn:commons-codec:commons-codec:1.10",
     "commons-cli": "mvn:commons-cli:commons-cli:1.3",
diff --git a/tools/build/bazel/generate_workspace.bzl b/tools/build/bazel/generate_workspace.bzl
index 4b8d632..6ae7dd0 100644
--- a/tools/build/bazel/generate_workspace.bzl
+++ b/tools/build/bazel/generate_workspace.bzl
@@ -1,4 +1,4 @@
-# ***** This file was auto-generated at Tue, 18 Dec 2018 02:18:38 GMT. Do not edit this file manually. *****
+# ***** This file was auto-generated at Tue, 18 Dec 2018 21:54:15 GMT. Do not edit this file manually. *****
 # ***** Use onos-lib-gen *****
 
 load("//tools/build/bazel:variables.bzl", "ONOS_GROUP_ID", "ONOS_VERSION")
@@ -162,45 +162,45 @@
     if "atomix" not in native.existing_rules():
         java_import_external(
             name = "atomix",
-            jar_sha256 = "55d0c603d6b54dd752eb71ea4b6ec965e4b140a1781f7f2b3ec2c5d8260dec4e",
+            jar_sha256 = "a2eec784aaaf6ef3496d7e8ba9ec21ca5068ebc0965bd5e1a61290998bed5afb",
             licenses = ["notice"],
-            jar_urls = ["http://repo1.maven.org/maven2/io/atomix/atomix/3.1.0-rc1/atomix-3.1.0-rc1.jar"],        )
+            jar_urls = ["http://repo1.maven.org/maven2/io/atomix/atomix/3.1.0-rc2/atomix-3.1.0-rc2.jar"],        )
     if "atomix_cluster" not in native.existing_rules():
         java_import_external(
             name = "atomix_cluster",
-            jar_sha256 = "7ac529817acaa501fbb6c0b1824c9fcb990dd451102d739fa3376473051398f6",
+            jar_sha256 = "1dc86b57c67cdc1653b1d8207dc7432da9354f0524db45ee4c189ba2ef2445eb",
             licenses = ["notice"],
-            jar_urls = ["http://repo1.maven.org/maven2/io/atomix/atomix-cluster/3.1.0-rc1/atomix-cluster-3.1.0-rc1.jar"],        )
+            jar_urls = ["http://repo1.maven.org/maven2/io/atomix/atomix-cluster/3.1.0-rc2/atomix-cluster-3.1.0-rc2.jar"],        )
     if "atomix_primary_backup" not in native.existing_rules():
         java_import_external(
             name = "atomix_primary_backup",
-            jar_sha256 = "565894fe588c5f971d3e835bc03b2226b8ebb77b7993472d92be922a33810116",
+            jar_sha256 = "3b713209ad3a16bb7ddd3aec5892a3f6d42b20218a183eeae3d12bda6bb43d57",
             licenses = ["notice"],
-            jar_urls = ["http://repo1.maven.org/maven2/io/atomix/atomix-primary-backup/3.1.0-rc1/atomix-primary-backup-3.1.0-rc1.jar"],        )
+            jar_urls = ["http://repo1.maven.org/maven2/io/atomix/atomix-primary-backup/3.1.0-rc2/atomix-primary-backup-3.1.0-rc2.jar"],        )
     if "atomix_primitive" not in native.existing_rules():
         java_import_external(
             name = "atomix_primitive",
-            jar_sha256 = "bd37f8e11920c8e211806df1319104eb5f133cd2cabebebd90107bc1b5d76847",
+            jar_sha256 = "128d8b2e06d346afc0b83b0ea4edaf9fdfba9d6656c3a3bcbe30e902b24f30ab",
             licenses = ["notice"],
-            jar_urls = ["http://repo1.maven.org/maven2/io/atomix/atomix-primitive/3.1.0-rc1/atomix-primitive-3.1.0-rc1.jar"],        )
+            jar_urls = ["http://repo1.maven.org/maven2/io/atomix/atomix-primitive/3.1.0-rc2/atomix-primitive-3.1.0-rc2.jar"],        )
     if "atomix_raft" not in native.existing_rules():
         java_import_external(
             name = "atomix_raft",
-            jar_sha256 = "8e39a0bf92a574af30b1b73271157af199e83f65ed86d3a2a73f52e049531d72",
+            jar_sha256 = "665c5fe1eca720906897c9e99902588cff55ac6f2f124a905e1d2e2340420998",
             licenses = ["notice"],
-            jar_urls = ["http://repo1.maven.org/maven2/io/atomix/atomix-raft/3.1.0-rc1/atomix-raft-3.1.0-rc1.jar"],        )
+            jar_urls = ["http://repo1.maven.org/maven2/io/atomix/atomix-raft/3.1.0-rc2/atomix-raft-3.1.0-rc2.jar"],        )
     if "atomix_storage" not in native.existing_rules():
         java_import_external(
             name = "atomix_storage",
-            jar_sha256 = "c11e91835db3267b5f779e9e52165856c67024b973abfc04f5dd504de112f9a6",
+            jar_sha256 = "d9717ebbb47e7f8ca4d475e8cc879fc53ccbc7cad6e5b80ee2d03e6ddf2fd8dc",
             licenses = ["notice"],
-            jar_urls = ["http://repo1.maven.org/maven2/io/atomix/atomix-storage/3.1.0-rc1/atomix-storage-3.1.0-rc1.jar"],        )
+            jar_urls = ["http://repo1.maven.org/maven2/io/atomix/atomix-storage/3.1.0-rc2/atomix-storage-3.1.0-rc2.jar"],        )
     if "atomix_utils" not in native.existing_rules():
         java_import_external(
             name = "atomix_utils",
-            jar_sha256 = "1b5b670b5a1519e4bc3624fc50dff6dff905ad25847824e5a90e1ab58995d5b3",
+            jar_sha256 = "4c156f7bbe7cf576387ba0b527de71fffe37af88ba1a150756bc5cfb2eb8839a",
             licenses = ["notice"],
-            jar_urls = ["http://repo1.maven.org/maven2/io/atomix/atomix-utils/3.1.0-rc1/atomix-utils-3.1.0-rc1.jar"],        )
+            jar_urls = ["http://repo1.maven.org/maven2/io/atomix/atomix-utils/3.1.0-rc2/atomix-utils-3.1.0-rc2.jar"],        )
     if "classgraph" not in native.existing_rules():
         java_import_external(
             name = "classgraph",
@@ -1423,13 +1423,13 @@
 artifact_map["@aopalliance_repackaged//:aopalliance_repackaged"] = "mvn:org.glassfish.hk2.external:aopalliance-repackaged:jar:2.5.0-b42"
 artifact_map["@amqp_client//:amqp_client"] = "mvn:com.rabbitmq:amqp-client:jar:3.6.1"
 artifact_map["@asm//:asm"] = "mvn:org.ow2.asm:asm:jar:5.2"
-artifact_map["@atomix//:atomix"] = "mvn:io.atomix:atomix:jar:3.1.0-rc1"
-artifact_map["@atomix_cluster//:atomix_cluster"] = "mvn:io.atomix:atomix-cluster:jar:3.1.0-rc1"
-artifact_map["@atomix_primary_backup//:atomix_primary_backup"] = "mvn:io.atomix:atomix-primary-backup:jar:3.1.0-rc1"
-artifact_map["@atomix_primitive//:atomix_primitive"] = "mvn:io.atomix:atomix-primitive:jar:3.1.0-rc1"
-artifact_map["@atomix_raft//:atomix_raft"] = "mvn:io.atomix:atomix-raft:jar:3.1.0-rc1"
-artifact_map["@atomix_storage//:atomix_storage"] = "mvn:io.atomix:atomix-storage:jar:3.1.0-rc1"
-artifact_map["@atomix_utils//:atomix_utils"] = "mvn:io.atomix:atomix-utils:jar:3.1.0-rc1"
+artifact_map["@atomix//:atomix"] = "mvn:io.atomix:atomix:jar:3.1.0-rc2"
+artifact_map["@atomix_cluster//:atomix_cluster"] = "mvn:io.atomix:atomix-cluster:jar:3.1.0-rc2"
+artifact_map["@atomix_primary_backup//:atomix_primary_backup"] = "mvn:io.atomix:atomix-primary-backup:jar:3.1.0-rc2"
+artifact_map["@atomix_primitive//:atomix_primitive"] = "mvn:io.atomix:atomix-primitive:jar:3.1.0-rc2"
+artifact_map["@atomix_raft//:atomix_raft"] = "mvn:io.atomix:atomix-raft:jar:3.1.0-rc2"
+artifact_map["@atomix_storage//:atomix_storage"] = "mvn:io.atomix:atomix-storage:jar:3.1.0-rc2"
+artifact_map["@atomix_utils//:atomix_utils"] = "mvn:io.atomix:atomix-utils:jar:3.1.0-rc2"
 artifact_map["@classgraph//:classgraph"] = "mvn:io.github.classgraph:classgraph:jar:4.2.3"
 artifact_map["@commons_codec//:commons_codec"] = "mvn:commons-codec:commons-codec:jar:1.10"
 artifact_map["@commons_cli//:commons_cli"] = "mvn:commons-cli:commons-cli:jar:1.3"
diff --git a/tools/test/bin/atomix-push-bits b/tools/test/bin/atomix-push-bits
index a1ebce2..f823281 100755
--- a/tools/test/bin/atomix-push-bits
+++ b/tools/test/bin/atomix-push-bits
@@ -26,7 +26,7 @@
 
 . $ONOS_ROOT/tools/build/envDefaults
 
-ATOMIX_VERSION=${ATOMIX_VERSION:-3.1.0-rc1}
+ATOMIX_VERSION=${ATOMIX_VERSION:-3.1.0-rc2}
 ATOMIX_MAVEN=~/.m2/repository/io/atomix/atomix-dist/$ATOMIX_VERSION/atomix-dist-$ATOMIX_VERSION.tar.gz
 ATOMIX_LOCAL=/tmp/atomix-$ATOMIX_VERSION.tar.gz
 ATOMIX_REMOTE=https://oss.sonatype.org/content/repositories/releases/io/atomix/atomix-dist/$ATOMIX_VERSION/atomix-dist-$ATOMIX_VERSION.tar.gz