diff --git a/lib/BUCK b/lib/BUCK
index be84bf6..ccafe7e 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -1,4 +1,4 @@
-# ***** This file was auto-generated at Wed, 22 Aug 2018 21:46:41 GMT. Do not edit this file manually. *****
+# ***** This file was auto-generated at Wed, 5 Sep 2018 19:30:35 GMT. Do not edit this file manually. *****
 # ***** Use onos-lib-gen *****
 
 pass_thru_pom(
@@ -242,73 +242,73 @@
 
 remote_jar (
   name = 'atomix',
-  out = 'atomix-3.0.1.jar',
-  url = 'mvn:io.atomix:atomix:jar:3.0.1',
-  sha1 = '18f0a2d827c851885c911ba79c12337e4b684882',
-  maven_coords = 'io.atomix:atomix:3.0.1',
+  out = 'atomix-3.0.4.jar',
+  url = 'mvn:io.atomix:atomix:jar:3.0.4',
+  sha1 = '31635ba3e703e5e0f4e5c984213af0a8ede9759f',
+  maven_coords = 'io.atomix:atomix:3.0.4',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_jar (
   name = 'atomix-cluster',
-  out = 'atomix-cluster-3.0.1.jar',
-  url = 'mvn:io.atomix:atomix-cluster:jar:3.0.1',
-  sha1 = 'c1f78bd5cf3a17ae0cfbe3e9753949acbf2a1a10',
-  maven_coords = 'io.atomix:atomix-cluster:3.0.1',
+  out = 'atomix-cluster-3.0.4.jar',
+  url = 'mvn:io.atomix:atomix-cluster:jar:3.0.4',
+  sha1 = '9b5cf96a4eea5f62f31aba0b36b16a2a6597957f',
+  maven_coords = 'io.atomix:atomix-cluster:3.0.4',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_jar (
   name = 'atomix-gossip',
-  out = 'atomix-gossip-3.0.1.jar',
-  url = 'mvn:io.atomix:atomix-gossip:jar:3.0.1',
-  sha1 = '5023cb9ee8f8b6ff99b101c93d513310429f43d0',
-  maven_coords = 'io.atomix:atomix-gossip:3.0.1',
+  out = 'atomix-gossip-3.0.4.jar',
+  url = 'mvn:io.atomix:atomix-gossip:jar:3.0.4',
+  sha1 = 'db8ad3d85dd6f353130b503ca236791d35733ef7',
+  maven_coords = 'io.atomix:atomix-gossip:3.0.4',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_jar (
   name = 'atomix-primary-backup',
-  out = 'atomix-primary-backup-3.0.1.jar',
-  url = 'mvn:io.atomix:atomix-primary-backup:jar:3.0.1',
-  sha1 = '69df17efb894313ed64fb84744931e63447a61de',
-  maven_coords = 'io.atomix:atomix-primary-backup:3.0.1',
+  out = 'atomix-primary-backup-3.0.4.jar',
+  url = 'mvn:io.atomix:atomix-primary-backup:jar:3.0.4',
+  sha1 = '05c5f8fa00755a0cf093aaf45decd8b8af15a092',
+  maven_coords = 'io.atomix:atomix-primary-backup:3.0.4',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_jar (
   name = 'atomix-primitive',
-  out = 'atomix-primitive-3.0.1.jar',
-  url = 'mvn:io.atomix:atomix-primitive:jar:3.0.1',
-  sha1 = '9f0f1120899288248d258ad6fe65ee15fe4f7846',
-  maven_coords = 'io.atomix:atomix-primitive:3.0.1',
+  out = 'atomix-primitive-3.0.4.jar',
+  url = 'mvn:io.atomix:atomix-primitive:jar:3.0.4',
+  sha1 = '0bb4854cb438bca77511453eec4dd3c632d54784',
+  maven_coords = 'io.atomix:atomix-primitive:3.0.4',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_jar (
   name = 'atomix-raft',
-  out = 'atomix-raft-3.0.1.jar',
-  url = 'mvn:io.atomix:atomix-raft:jar:3.0.1',
-  sha1 = '6bcf6864f8549815dea930c90d302302b88c33a6',
-  maven_coords = 'io.atomix:atomix-raft:3.0.1',
+  out = 'atomix-raft-3.0.4.jar',
+  url = 'mvn:io.atomix:atomix-raft:jar:3.0.4',
+  sha1 = '5abb1d86d0766f241122a9b264aed72f9f5385e4',
+  maven_coords = 'io.atomix:atomix-raft:3.0.4',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_jar (
   name = 'atomix-storage',
-  out = 'atomix-storage-3.0.1.jar',
-  url = 'mvn:io.atomix:atomix-storage:jar:3.0.1',
-  sha1 = '1008706bb2fc5f65b32e57ec4f5204798a97d551',
-  maven_coords = 'io.atomix:atomix-storage:3.0.1',
+  out = 'atomix-storage-3.0.4.jar',
+  url = 'mvn:io.atomix:atomix-storage:jar:3.0.4',
+  sha1 = '5f2c2ef1cf220f6b23f12cc216260dbf99c5ae45',
+  maven_coords = 'io.atomix:atomix-storage:3.0.4',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_jar (
   name = 'atomix-utils',
-  out = 'atomix-utils-3.0.1.jar',
-  url = 'mvn:io.atomix:atomix-utils:jar:3.0.1',
-  sha1 = 'e9d83e8a440ff0af9c693e9cf4e46e3448e05193',
-  maven_coords = 'io.atomix:atomix-utils:3.0.1',
+  out = 'atomix-utils-3.0.4.jar',
+  url = 'mvn:io.atomix:atomix-utils:jar:3.0.4',
+  sha1 = 'a95c853901f36f2b3049cf6e17b526b5972d1271',
+  maven_coords = 'io.atomix:atomix-utils:3.0.4',
   visibility = [ 'PUBLIC' ],
 )
 
diff --git a/lib/deps.json b/lib/deps.json
index 7beab29..e1403de 100644
--- a/lib/deps.json
+++ b/lib/deps.json
@@ -138,14 +138,14 @@
     "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.0.4",
-    "atomix": "mvn:io.atomix:atomix:3.0.1",
-    "atomix-cluster": "mvn:io.atomix:atomix-cluster:3.0.1",
-    "atomix-gossip": "mvn:io.atomix:atomix-gossip:3.0.1",
-    "atomix-primary-backup": "mvn:io.atomix:atomix-primary-backup:3.0.1",
-    "atomix-primitive": "mvn:io.atomix:atomix-primitive:3.0.1",
-    "atomix-raft": "mvn:io.atomix:atomix-raft:3.0.1",
-    "atomix-storage": "mvn:io.atomix:atomix-storage:3.0.1",
-    "atomix-utils": "mvn:io.atomix:atomix-utils:3.0.1",
+    "atomix": "mvn:io.atomix:atomix:3.0.4",
+    "atomix-cluster": "mvn:io.atomix:atomix-cluster:3.0.4",
+    "atomix-gossip": "mvn:io.atomix:atomix-gossip:3.0.4",
+    "atomix-primary-backup": "mvn:io.atomix:atomix-primary-backup:3.0.4",
+    "atomix-primitive": "mvn:io.atomix:atomix-primitive:3.0.4",
+    "atomix-raft": "mvn:io.atomix:atomix-raft:3.0.4",
+    "atomix-storage": "mvn:io.atomix:atomix-storage:3.0.4",
+    "atomix-utils": "mvn:io.atomix:atomix-utils:3.0.4",
     "classgraph": "mvn:io.github.classgraph:classgraph:4.0.6",
     "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 8f56d40..549fb72 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 Wed, 22 Aug 2018 21:46:39 GMT. Do not edit this file manually. *****
+# ***** This file was auto-generated at Wed, 5 Sep 2018 19:30:33 GMT. Do not edit this file manually. *****
 # ***** Use onos-lib-gen *****
 
 load("//tools/build/bazel:variables.bzl", "ONOS_GROUP_ID", "ONOS_VERSION")
@@ -156,57 +156,57 @@
     if "atomix" not in native.existing_rules():
         native.maven_jar(
             name = "atomix",
-            artifact = "io.atomix:atomix:3.0.1",
-            sha1 = "18f0a2d827c851885c911ba79c12337e4b684882",
+            artifact = "io.atomix:atomix:3.0.4",
+            sha1 = "31635ba3e703e5e0f4e5c984213af0a8ede9759f",
         )
 
     if "atomix_cluster" not in native.existing_rules():
         native.maven_jar(
             name = "atomix_cluster",
-            artifact = "io.atomix:atomix-cluster:3.0.1",
-            sha1 = "c1f78bd5cf3a17ae0cfbe3e9753949acbf2a1a10",
+            artifact = "io.atomix:atomix-cluster:3.0.4",
+            sha1 = "9b5cf96a4eea5f62f31aba0b36b16a2a6597957f",
         )
 
     if "atomix_gossip" not in native.existing_rules():
         native.maven_jar(
             name = "atomix_gossip",
-            artifact = "io.atomix:atomix-gossip:3.0.1",
-            sha1 = "5023cb9ee8f8b6ff99b101c93d513310429f43d0",
+            artifact = "io.atomix:atomix-gossip:3.0.4",
+            sha1 = "db8ad3d85dd6f353130b503ca236791d35733ef7",
         )
 
     if "atomix_primary_backup" not in native.existing_rules():
         native.maven_jar(
             name = "atomix_primary_backup",
-            artifact = "io.atomix:atomix-primary-backup:3.0.1",
-            sha1 = "69df17efb894313ed64fb84744931e63447a61de",
+            artifact = "io.atomix:atomix-primary-backup:3.0.4",
+            sha1 = "05c5f8fa00755a0cf093aaf45decd8b8af15a092",
         )
 
     if "atomix_primitive" not in native.existing_rules():
         native.maven_jar(
             name = "atomix_primitive",
-            artifact = "io.atomix:atomix-primitive:3.0.1",
-            sha1 = "9f0f1120899288248d258ad6fe65ee15fe4f7846",
+            artifact = "io.atomix:atomix-primitive:3.0.4",
+            sha1 = "0bb4854cb438bca77511453eec4dd3c632d54784",
         )
 
     if "atomix_raft" not in native.existing_rules():
         native.maven_jar(
             name = "atomix_raft",
-            artifact = "io.atomix:atomix-raft:3.0.1",
-            sha1 = "6bcf6864f8549815dea930c90d302302b88c33a6",
+            artifact = "io.atomix:atomix-raft:3.0.4",
+            sha1 = "5abb1d86d0766f241122a9b264aed72f9f5385e4",
         )
 
     if "atomix_storage" not in native.existing_rules():
         native.maven_jar(
             name = "atomix_storage",
-            artifact = "io.atomix:atomix-storage:3.0.1",
-            sha1 = "1008706bb2fc5f65b32e57ec4f5204798a97d551",
+            artifact = "io.atomix:atomix-storage:3.0.4",
+            sha1 = "5f2c2ef1cf220f6b23f12cc216260dbf99c5ae45",
         )
 
     if "atomix_utils" not in native.existing_rules():
         native.maven_jar(
             name = "atomix_utils",
-            artifact = "io.atomix:atomix-utils:3.0.1",
-            sha1 = "e9d83e8a440ff0af9c693e9cf4e46e3448e05193",
+            artifact = "io.atomix:atomix-utils:3.0.4",
+            sha1 = "a95c853901f36f2b3049cf6e17b526b5972d1271",
         )
 
     if "classgraph" not in native.existing_rules():
@@ -1523,14 +1523,14 @@
 artifact_map["@aopalliance_repackaged//jar"] = "mvn:org.glassfish.hk2.external:aopalliance-repackaged:jar:2.5.0-b42"
 artifact_map["@amqp_client//jar"] = "mvn:com.rabbitmq:amqp-client:jar:3.6.1"
 artifact_map["@asm//jar"] = "mvn:org.ow2.asm:asm:jar:5.0.4"
-artifact_map["@atomix//jar"] = "mvn:io.atomix:atomix:jar:3.0.1"
-artifact_map["@atomix_cluster//jar"] = "mvn:io.atomix:atomix-cluster:jar:3.0.1"
-artifact_map["@atomix_gossip//jar"] = "mvn:io.atomix:atomix-gossip:jar:3.0.1"
-artifact_map["@atomix_primary_backup//jar"] = "mvn:io.atomix:atomix-primary-backup:jar:3.0.1"
-artifact_map["@atomix_primitive//jar"] = "mvn:io.atomix:atomix-primitive:jar:3.0.1"
-artifact_map["@atomix_raft//jar"] = "mvn:io.atomix:atomix-raft:jar:3.0.1"
-artifact_map["@atomix_storage//jar"] = "mvn:io.atomix:atomix-storage:jar:3.0.1"
-artifact_map["@atomix_utils//jar"] = "mvn:io.atomix:atomix-utils:jar:3.0.1"
+artifact_map["@atomix//jar"] = "mvn:io.atomix:atomix:jar:3.0.4"
+artifact_map["@atomix_cluster//jar"] = "mvn:io.atomix:atomix-cluster:jar:3.0.4"
+artifact_map["@atomix_gossip//jar"] = "mvn:io.atomix:atomix-gossip:jar:3.0.4"
+artifact_map["@atomix_primary_backup//jar"] = "mvn:io.atomix:atomix-primary-backup:jar:3.0.4"
+artifact_map["@atomix_primitive//jar"] = "mvn:io.atomix:atomix-primitive:jar:3.0.4"
+artifact_map["@atomix_raft//jar"] = "mvn:io.atomix:atomix-raft:jar:3.0.4"
+artifact_map["@atomix_storage//jar"] = "mvn:io.atomix:atomix-storage:jar:3.0.4"
+artifact_map["@atomix_utils//jar"] = "mvn:io.atomix:atomix-utils:jar:3.0.4"
 artifact_map["@classgraph//jar"] = "mvn:io.github.classgraph:classgraph:jar:4.0.6"
 artifact_map["@commons_codec//jar"] = "mvn:commons-codec:commons-codec:jar:1.10"
 artifact_map["@commons_cli//jar"] = "mvn:commons-cli:commons-cli:jar:1.3"