Merge remote-tracking branch 'origin/master' into merge-master

Change-Id: I4608093c4400a313b253508ac6bc8a84ecba5c7e
diff --git a/lib/BUCK b/lib/BUCK
index 119fe4b..55a2608 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 # ***** This file was auto-generated at Tue, 18 Sep 2018 20:31:36 GMT. Do not edit this file manually. *****
+=======
+# ***** This file was auto-generated at Thu, 27 Sep 2018 15:25:26 GMT. Do not edit this file manually. *****
+>>>>>>> origin/master
 # ***** Use onos-lib-gen *****
 
 pass_thru_pom(
@@ -601,6 +605,42 @@
 )
 
 remote_jar (
+  name = 'simpleclient',
+  out = 'simpleclient-0.5.0.jar',
+  url = 'mvn:io.prometheus:simpleclient:jar:0.5.0',
+  sha1 = 'fbbfe2300098798e3d23f93b7b14befeceacf512',
+  maven_coords = 'io.prometheus:simpleclient:0.5.0',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_jar (
+  name = 'simpleclient_common',
+  out = 'simpleclient_common-0.5.0.jar',
+  url = 'mvn:io.prometheus:simpleclient_common:jar:0.5.0',
+  sha1 = 'bfd93082d7cf85c0543c2ccc286b96c817d1090c',
+  maven_coords = 'io.prometheus:simpleclient_common:0.5.0',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_jar (
+  name = 'simpleclient_hotspot',
+  out = 'simpleclient_hotspot-0.5.0.jar',
+  url = 'mvn:io.prometheus:simpleclient_hotspot:jar:0.5.0',
+  sha1 = '0f341cb84d6713255b1ce46c7593eee50a35d414',
+  maven_coords = 'io.prometheus:simpleclient_hotspot:0.5.0',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_jar (
+  name = 'simpleclient_servlet',
+  out = 'simpleclient_servlet-0.5.0.jar',
+  url = 'mvn:io.prometheus:simpleclient_servlet:jar:0.5.0',
+  sha1 = '28d75ee90a5c2ac70eeebb0864b15885116207a4',
+  maven_coords = 'io.prometheus:simpleclient_servlet:0.5.0',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_jar (
   name = 'retrofit',
   out = 'retrofit-2.3.0.jar',
   url = 'mvn:com.squareup.retrofit2:retrofit:jar:2.3.0',
@@ -844,6 +884,24 @@
 )
 
 remote_jar (
+  name = 'jetty-servlet',
+  out = 'jetty-servlet-9.2.26.v20180806.jar',
+  url = 'mvn:org.eclipse.jetty:jetty-servlet:jar:9.2.26.v20180806',
+  sha1 = '7d54ae4579454d9df2c3324de7eddfbd81ffb8cc',
+  maven_coords = 'org.eclipse.jetty:jetty-servlet:9.2.26.v20180806',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_jar (
+  name = 'jetty-security',
+  out = 'jetty-security-9.2.21.v20170120.jar',
+  url = 'mvn:org.eclipse.jetty:jetty-security:jar:9.2.21.v20170120',
+  sha1 = 'ceb39cd058fa22172c6e7ef493af90891e701f23',
+  maven_coords = 'org.eclipse.jetty:jetty-security:9.2.21.v20170120',
+  visibility = [ 'PUBLIC' ],
+)
+
+remote_jar (
   name = 'jetty-continuation',
   out = 'jetty-continuation-9.4.11.v20180605.jar',
   url = 'mvn:org.eclipse.jetty:jetty-continuation:jar:9.4.11.v20180605',