diff --git a/tools/build/bazel/generate_workspace.bzl b/tools/build/bazel/generate_workspace.bzl
index 1239015..c06aa22 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, 30 Jun 2018 08:02:29 GMT. Do not edit this file manually. *****
+# ***** This file was auto-generated at Mon, 2 Jul 2018 20:10:47 GMT. Do not edit this file manually. *****
 # ***** Use onos-lib-gen *****
 
 load("//tools/build/bazel:variables.bzl", "ONOS_GROUP_ID", "ONOS_VERSION")
@@ -907,38 +907,38 @@
 
     native.maven_jar(
         name = "onos_yang_model",
-        artifact = "org.onosproject:onos-yang-model:2.4.7",
-        sha1 = "c459be8b61650d1e8860b4d13b7ec867a6072b55",
+        artifact = "org.onosproject:onos-yang-model:2.5",
+        sha1 = "61339921f42354e499e550c15283e4aa75a03ef7",
     )
 
     native.maven_jar(
         name = "onos_yang_compiler_api",
-        artifact = "org.onosproject:onos-yang-compiler-api:2.4.7",
-        sha1 = "f087fa5c52b0cb3c56624519f5631b819d59dd28",
+        artifact = "org.onosproject:onos-yang-compiler-api:2.5",
+        sha1 = "c504df941d1a1b49e4dd8045c935120f3483504e",
     )
 
     native.maven_jar(
         name = "onos_yang_runtime",
-        artifact = "org.onosproject:onos-yang-runtime:2.4.7",
-        sha1 = "12e139467380f54891a5cf29f12d717d22e4cb42",
+        artifact = "org.onosproject:onos-yang-runtime:2.5",
+        sha1 = "9d621709f34fd7da4d1954d868ac0eddeba725d2",
     )
 
     native.maven_jar(
         name = "onos_yang_serializers_json",
-        artifact = "org.onosproject:onos-yang-serializers-json:2.4.7",
-        sha1 = "2784dca04f444e218667760b39ca5c74b743f168",
+        artifact = "org.onosproject:onos-yang-serializers-json:2.5",
+        sha1 = "cf442f226b9423c22eb5ec9409e99fe3a0f63a37",
     )
 
     native.maven_jar(
         name = "onos_yang_serializers_xml",
-        artifact = "org.onosproject:onos-yang-serializers-xml:2.4.7",
-        sha1 = "fcf7b98b1bfaaab7d34a2f47eadb0a8c51e34a37",
+        artifact = "org.onosproject:onos-yang-serializers-xml:2.5",
+        sha1 = "7f7231237da9571f79700d2ee0a218cd6253409c",
     )
 
     native.maven_jar(
         name = "onos_yang_serializers_utils",
-        artifact = "org.onosproject:onos-yang-serializers-utils:2.4.7",
-        sha1 = "6c6ed696ae7a23b6d0a45138ef6bc07768f4a9b5",
+        artifact = "org.onosproject:onos-yang-serializers-utils:2.5",
+        sha1 = "13f804292e42635fcf28bbadffca8bb72c00b327",
     )
 
     native.maven_jar(
@@ -2239,12 +2239,12 @@
 artifact_map[str(Label("@btf//jar"))] = "mvn:com.github.fge:btf:jar:1.2"
 artifact_map[str(Label("@msg_simple//jar"))] = "mvn:com.github.fge:msg-simple:jar:1.1"
 artifact_map[str(Label("@snakeyaml//jar"))] = "mvn:org.yaml:snakeyaml:jar:1.15"
-artifact_map[str(Label("@onos_yang_model//jar"))] = "mvn:org.onosproject:onos-yang-model:jar:2.4.7"
-artifact_map[str(Label("@onos_yang_compiler_api//jar"))] = "mvn:org.onosproject:onos-yang-compiler-api:jar:2.4.7"
-artifact_map[str(Label("@onos_yang_runtime//jar"))] = "mvn:org.onosproject:onos-yang-runtime:jar:2.4.7"
-artifact_map[str(Label("@onos_yang_serializers_json//jar"))] = "mvn:org.onosproject:onos-yang-serializers-json:jar:2.4.7"
-artifact_map[str(Label("@onos_yang_serializers_xml//jar"))] = "mvn:org.onosproject:onos-yang-serializers-xml:jar:2.4.7"
-artifact_map[str(Label("@onos_yang_serializers_utils//jar"))] = "mvn:org.onosproject:onos-yang-serializers-utils:jar:2.4.7"
+artifact_map[str(Label("@onos_yang_model//jar"))] = "mvn:org.onosproject:onos-yang-model:jar:2.5"
+artifact_map[str(Label("@onos_yang_compiler_api//jar"))] = "mvn:org.onosproject:onos-yang-compiler-api:jar:2.5"
+artifact_map[str(Label("@onos_yang_runtime//jar"))] = "mvn:org.onosproject:onos-yang-runtime:jar:2.5"
+artifact_map[str(Label("@onos_yang_serializers_json//jar"))] = "mvn:org.onosproject:onos-yang-serializers-json:jar:2.5"
+artifact_map[str(Label("@onos_yang_serializers_xml//jar"))] = "mvn:org.onosproject:onos-yang-serializers-xml:jar:2.5"
+artifact_map[str(Label("@onos_yang_serializers_utils//jar"))] = "mvn:org.onosproject:onos-yang-serializers-utils:jar:2.5"
 artifact_map[str(Label("@org_apache_servicemix_bundles_dom4j//jar"))] = "mvn:org.apache.servicemix.bundles:org.apache.servicemix.bundles.dom4j:jar:1.6.1_5"
 artifact_map[str(Label("@plexus_utils//jar"))] = "mvn:org.codehaus.plexus:plexus-utils:jar:NON-OSGI:3.0.24"
 artifact_map[str(Label("@sshd_core//jar"))] = "mvn:org.apache.sshd:sshd-core:jar:1.4.0"