diff --git a/apps/artemis/BUILD b/apps/artemis/BUILD
new file mode 100755
index 0000000..9634521
--- /dev/null
+++ b/apps/artemis/BUILD
@@ -0,0 +1,55 @@
+COMPILE_DEPS = CORE_DEPS + JACKSON + NETTY + CLI + [
+    "@okhttp//jar",
+    "@okio//jar",
+    "@commons_net//jar",
+    "@io_socket_client//jar",
+    "@json//jar",
+    "@engine_io_client//jar",
+    "@netty//jar",
+    "@netty_transport//jar",
+    "//apps/routing-api:onos-apps-routing-api",
+    "//apps/routing/common:onos-apps-routing-common",
+    "//protocols/ovsdb/api:onos-protocols-ovsdb-api",
+    "//apps/intentsync:onos-apps-intentsync",
+    "//apps/route-service/api:onos-apps-route-service-api",
+    "//protocols/ovsdb/rfc:onos-protocols-ovsdb-rfc",
+]
+
+BUNDLES = [
+    "@commons_net//jar",
+    "@io_socket_client//jar",
+    "@json//jar",
+    "@engine_io_client//jar",
+    "//apps/artemis:onos-apps-artemis",
+    "//apps/routing-api:onos-apps-routing-api",
+    "//apps/routing/common:onos-apps-routing-common",
+    "//protocols/ovsdb/api:onos-protocols-ovsdb-api",
+    "//apps/route-service/api:onos-apps-route-service-api",
+    "//protocols/ovsdb/rfc:onos-protocols-ovsdb-rfc",
+]
+
+EXCLUDED_BUNDLES = [
+    "@okhttp//jar",
+    "@okio//jar",
+]
+
+osgi_jar_with_tests(
+    test_deps = TEST_ADAPTERS,
+    deps = COMPILE_DEPS,
+)
+
+onos_app(
+    app_name = "org.onosproject.artemis",
+    category = "Monitoring",
+    description = "Artemis",
+    excluded_bundles = EXCLUDED_BUNDLES,
+    included_bundles = BUNDLES,
+    required_apps = [
+        "org.onosproject.sdnip",
+        "org.onosproject.openflow",
+        "org.onosproject.ovsdb",
+        "org.onosproject.drivers.ovsdb",
+    ],
+    title = "Artemis",
+    url = "http://onosproject.org",
+)
diff --git a/lib/BUCK b/lib/BUCK
index a7d951d..5368870 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -1,4 +1,4 @@
-# ***** This file was auto-generated at Sat, 21 Jul 2018 09:40:22 GMT. Do not edit this file manually. *****
+# ***** This file was auto-generated at Mon, 23 Jul 2018 20:11:01 GMT. Do not edit this file manually. *****
 # ***** Use onos-lib-gen *****
 
 pass_thru_pom(
@@ -341,6 +341,15 @@
 )
 
 remote_jar (
+  name = 'commons-net',
+  out = 'commons-net-3.5.jar',
+  url = 'mvn:commons-net:commons-net:jar:3.5',
+  sha1 = '342fc284019f590e1308056990fdb24a08f06318',
+  maven_coords = 'commons-net:commons-net:3.5',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_jar (
   name = 'commons-pool',
   out = 'commons-pool-1.6.jar',
   url = 'mvn:commons-pool:commons-pool:jar:1.6',
@@ -1320,6 +1329,33 @@
 )
 
 remote_jar (
+  name = 'io.socket-client',
+  out = 'socket.io-client-0.8.3.jar',
+  url = 'mvn:io.socket:socket.io-client:jar:0.8.3',
+  sha1 = 'b30500232ff0668a47c9f91f02e6935457a52fb5',
+  maven_coords = 'io.socket:socket.io-client:jar:NON-OSGI:0.8.3',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_jar (
+  name = 'json',
+  out = 'json-20090211.jar',
+  url = 'mvn:org.json:json:jar:20090211',
+  sha1 = 'c183aa3a2a6250293808bba12262c8920ce5a51c',
+  maven_coords = 'org.json:json:jar:NON-OSGI:20090211',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_jar (
+  name = 'engine.io-client',
+  out = 'engine.io-client-0.8.3.jar',
+  url = 'mvn:io.socket:engine.io-client:jar:0.8.3',
+  sha1 = '854b49396e1e9f9bb0ab025062ddb49c4ed65ca1',
+  maven_coords = 'io.socket:engine.io-client:jar:NON-OSGI:0.8.3',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_jar (
   name = 'openstack4j-core',
   out = 'openstack4j-core-3.1.0.jar',
   url = 'mvn:org.pacesys:openstack4j-core:jar:3.1.0',
diff --git a/lib/deps.json b/lib/deps.json
index e7e7b02..1402431 100644
--- a/lib/deps.json
+++ b/lib/deps.json
@@ -137,6 +137,7 @@
     "commons-lang3": "mvn:org.apache.commons:commons-lang3:3.7",
     "commons-logging": "mvn:commons-logging:commons-logging:1.2",
     "commons-math3": "mvn:org.apache.commons:commons-math3:3.6.1",
+    "commons-net": "mvn:commons-net:commons-net:jar:3.5",
     "commons-pool": "mvn:commons-pool:commons-pool:1.6",
     "commons-text": "mvn:org.apache.commons:commons-text:1.3",
     "concurrent-trees": "mvn:com.googlecode.concurrent-trees:concurrent-trees:2.6.1",
@@ -249,6 +250,9 @@
     "snmp-core": "mvn:org.onosproject:snmp-core:1.3-20161021.1",
     "mibs-net-snmp": "mvn:org.onosproject:mibbler-mibs-net-snmp:1.0-20151221.1",
     "mibs-rfc": "mvn:org.onosproject:mibbler-mibs-rfc:1.0-20151221.1",
+    "io.socket-client": "mvn:io.socket:socket.io-client:jar:0.8.3",
+    "json": "mvn:org.json:json:jar:20090211",
+    "engine.io-client": "mvn:io.socket:engine.io-client:jar:0.8.3",
 
     // Openstack4j related jars
     "openstack4j-core": "mvn:org.pacesys:openstack4j-core:3.1.0",
diff --git a/modules.bzl b/modules.bzl
index b829045..e30a370 100644
--- a/modules.bzl
+++ b/modules.bzl
@@ -221,7 +221,7 @@
     "//apps/network-troubleshoot:onos-apps-network-troubleshoot-oar",
     "//apps/l3vpn:onos-apps-l3vpn-oar",
     "//apps/openroadm:onos-apps-openroadm-oar",
-    #"//apps/artemis:onos-apps-artemis-oar",
+    "//apps/artemis:onos-apps-artemis-oar",
     "//apps/pi-demo/ecmp:onos-apps-pi-demo-ecmp-oar",
     "//apps/gluon:onos-apps-gluon-oar",
     "//apps/evpnopenflow:onos-apps-evpnopenflow-oar",
diff --git a/tools/build/bazel/generate_workspace.bzl b/tools/build/bazel/generate_workspace.bzl
index 4f57397..19232ff 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 Sat, 21 Jul 2018 09:40:31 GMT. Do not edit this file manually. *****
+# ***** This file was auto-generated at Mon, 23 Jul 2018 20:11:05 GMT. Do not edit this file manually. *****
 # ***** Use onos-lib-gen *****
 
 load("//tools/build/bazel:variables.bzl", "ONOS_GROUP_ID", "ONOS_VERSION")
@@ -217,6 +217,12 @@
     )
 
     native.maven_jar(
+        name = "commons_net",
+        artifact = "commons-net:commons-net:3.5",
+        sha1 = "342fc284019f590e1308056990fdb24a08f06318",
+    )
+
+    native.maven_jar(
         name = "commons_pool",
         artifact = "commons-pool:commons-pool:1.6",
         sha1 = "4572d589699f09d866a226a14b7f4323c6d8f040",
@@ -872,6 +878,24 @@
     )
 
     native.maven_jar(
+        name = "io_socket_client",
+        artifact = "io.socket:socket.io-client:0.8.3",
+        sha1 = "b30500232ff0668a47c9f91f02e6935457a52fb5",
+    )
+
+    native.maven_jar(
+        name = "json",
+        artifact = "org.json:json:20090211",
+        sha1 = "c183aa3a2a6250293808bba12262c8920ce5a51c",
+    )
+
+    native.maven_jar(
+        name = "engine_io_client",
+        artifact = "io.socket:engine.io-client:0.8.3",
+        sha1 = "854b49396e1e9f9bb0ab025062ddb49c4ed65ca1",
+    )
+
+    native.maven_jar(
         name = "openstack4j_core",
         artifact = "org.pacesys:openstack4j-core:3.1.0",
         sha1 = "634c2ad6728bb6e4cd91c950dd654aacb6f107a6",
@@ -1233,6 +1257,12 @@
     )
 
     native.java_library(
+        name = "commons_net",
+        visibility = ["//visibility:public"],
+        exports = ["@commons_net//jar"],
+    )
+
+    native.java_library(
         name = "commons_pool",
         visibility = ["//visibility:public"],
         exports = ["@commons_pool//jar"],
@@ -1875,6 +1905,24 @@
     )
 
     native.java_library(
+        name = "io_socket_client",
+        visibility = ["//visibility:public"],
+        exports = ["@io_socket_client//jar"],
+    )
+
+    native.java_library(
+        name = "json",
+        visibility = ["//visibility:public"],
+        exports = ["@json//jar"],
+    )
+
+    native.java_library(
+        name = "engine_io_client",
+        visibility = ["//visibility:public"],
+        exports = ["@engine_io_client//jar"],
+    )
+
+    native.java_library(
         name = "openstack4j_core",
         visibility = ["//visibility:public"],
         exports = ["@openstack4j_core//jar"],
@@ -2155,6 +2203,7 @@
 artifact_map["@commons_lang3//jar"] = "mvn:org.apache.commons:commons-lang3:jar:3.7"
 artifact_map["@commons_logging//jar"] = "mvn:commons-logging:commons-logging:jar:1.2"
 artifact_map["@commons_math3//jar"] = "mvn:org.apache.commons:commons-math3:jar:3.6.1"
+artifact_map["@commons_net//jar"] = "mvn:commons-net:commons-net:jar:3.5"
 artifact_map["@commons_pool//jar"] = "mvn:commons-pool:commons-pool:jar:1.6"
 artifact_map["@commons_text//jar"] = "mvn:org.apache.commons:commons-text:jar:1.3"
 artifact_map["@concurrent_trees//jar"] = "mvn:com.googlecode.concurrent-trees:concurrent-trees:jar:2.6.1"
@@ -2264,6 +2313,9 @@
 artifact_map["@snmp_core//jar"] = "mvn:org.onosproject:snmp-core:jar:1.3-20161021.1"
 artifact_map["@mibs_net_snmp//jar"] = "mvn:org.onosproject:mibbler-mibs-net-snmp:jar:1.0-20151221.1"
 artifact_map["@mibs_rfc//jar"] = "mvn:org.onosproject:mibbler-mibs-rfc:jar:1.0-20151221.1"
+artifact_map["@io_socket_client//jar"] = "mvn:io.socket:socket.io-client:jar:NON-OSGI:0.8.3"
+artifact_map["@json//jar"] = "mvn:org.json:json:jar:NON-OSGI:20090211"
+artifact_map["@engine_io_client//jar"] = "mvn:io.socket:engine.io-client:jar:NON-OSGI:0.8.3"
 artifact_map["@openstack4j_core//jar"] = "mvn:org.pacesys:openstack4j-core:jar:3.1.0"
 artifact_map["@openstack4j_http_connector//jar"] = "mvn:org.pacesys.openstack4j.connectors:openstack4j-http-connector:jar:3.1.0"
 artifact_map["@openstack4j_httpclient//jar"] = "mvn:org.pacesys.openstack4j.connectors:openstack4j-httpclient:jar:3.1.0"