diff --git a/lib/BUCK b/lib/BUCK
index e44da2a..85a235f 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -1,4 +1,4 @@
-# ***** This file was auto-generated at Sat, 30 Jun 2018 08:02:26 GMT. Do not edit this file manually. *****
+# ***** This file was auto-generated at Mon, 2 Jul 2018 20:10:43 GMT. Do not edit this file manually. *****
 # ***** Use onos-lib-gen *****
 
 pass_thru_pom(
@@ -1366,55 +1366,55 @@
 
 remote_jar (
   name = 'onos-yang-model',
-  out = 'onos-yang-model-2.4.7.jar',
-  url = 'mvn:org.onosproject:onos-yang-model:jar:2.4.7',
-  sha1 = 'c459be8b61650d1e8860b4d13b7ec867a6072b55',
-  maven_coords = 'org.onosproject:onos-yang-model:2.4.7',
+  out = 'onos-yang-model-2.5.jar',
+  url = 'mvn:org.onosproject:onos-yang-model:jar:2.5',
+  sha1 = '61339921f42354e499e550c15283e4aa75a03ef7',
+  maven_coords = 'org.onosproject:onos-yang-model:2.5',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_jar (
   name = 'onos-yang-compiler-api',
-  out = 'onos-yang-compiler-api-2.4.7.jar',
-  url = 'mvn:org.onosproject:onos-yang-compiler-api:jar:2.4.7',
-  sha1 = 'f087fa5c52b0cb3c56624519f5631b819d59dd28',
-  maven_coords = 'org.onosproject:onos-yang-compiler-api:2.4.7',
+  out = 'onos-yang-compiler-api-2.5.jar',
+  url = 'mvn:org.onosproject:onos-yang-compiler-api:jar:2.5',
+  sha1 = 'c504df941d1a1b49e4dd8045c935120f3483504e',
+  maven_coords = 'org.onosproject:onos-yang-compiler-api:2.5',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_jar (
   name = 'onos-yang-runtime',
-  out = 'onos-yang-runtime-2.4.7.jar',
-  url = 'mvn:org.onosproject:onos-yang-runtime:jar:2.4.7',
-  sha1 = '12e139467380f54891a5cf29f12d717d22e4cb42',
-  maven_coords = 'org.onosproject:onos-yang-runtime:2.4.7',
+  out = 'onos-yang-runtime-2.5.jar',
+  url = 'mvn:org.onosproject:onos-yang-runtime:jar:2.5',
+  sha1 = '9d621709f34fd7da4d1954d868ac0eddeba725d2',
+  maven_coords = 'org.onosproject:onos-yang-runtime:2.5',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_jar (
   name = 'onos-yang-serializers-json',
-  out = 'onos-yang-serializers-json-2.4.7.jar',
-  url = 'mvn:org.onosproject:onos-yang-serializers-json:jar:2.4.7',
-  sha1 = '2784dca04f444e218667760b39ca5c74b743f168',
-  maven_coords = 'org.onosproject:onos-yang-serializers-json:2.4.7',
+  out = 'onos-yang-serializers-json-2.5.jar',
+  url = 'mvn:org.onosproject:onos-yang-serializers-json:jar:2.5',
+  sha1 = 'cf442f226b9423c22eb5ec9409e99fe3a0f63a37',
+  maven_coords = 'org.onosproject:onos-yang-serializers-json:2.5',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_jar (
   name = 'onos-yang-serializers-xml',
-  out = 'onos-yang-serializers-xml-2.4.7.jar',
-  url = 'mvn:org.onosproject:onos-yang-serializers-xml:jar:2.4.7',
-  sha1 = 'fcf7b98b1bfaaab7d34a2f47eadb0a8c51e34a37',
-  maven_coords = 'org.onosproject:onos-yang-serializers-xml:2.4.7',
+  out = 'onos-yang-serializers-xml-2.5.jar',
+  url = 'mvn:org.onosproject:onos-yang-serializers-xml:jar:2.5',
+  sha1 = '7f7231237da9571f79700d2ee0a218cd6253409c',
+  maven_coords = 'org.onosproject:onos-yang-serializers-xml:2.5',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_jar (
   name = 'onos-yang-serializers-utils',
-  out = 'onos-yang-serializers-utils-2.4.7.jar',
-  url = 'mvn:org.onosproject:onos-yang-serializers-utils:jar:2.4.7',
-  sha1 = '6c6ed696ae7a23b6d0a45138ef6bc07768f4a9b5',
-  maven_coords = 'org.onosproject:onos-yang-serializers-utils:2.4.7',
+  out = 'onos-yang-serializers-utils-2.5.jar',
+  url = 'mvn:org.onosproject:onos-yang-serializers-utils:jar:2.5',
+  sha1 = '13f804292e42635fcf28bbadffca8bb72c00b327',
+  maven_coords = 'org.onosproject:onos-yang-serializers-utils:2.5',
   visibility = [ 'PUBLIC' ],
 )
 
diff --git a/lib/deps.json b/lib/deps.json
index a0be46d..cbf30ed 100644
--- a/lib/deps.json
+++ b/lib/deps.json
@@ -252,12 +252,12 @@
     "snakeyaml": "mvn:org.yaml:snakeyaml:1.15",
 
     // Note update BVER in tools/dev/bin/patch-yang-libs and YANG_VER in tools/build/onos-buck
-    "onos-yang-model":"mvn:org.onosproject:onos-yang-model:2.4.7",
-    "onos-yang-compiler-api":"mvn:org.onosproject:onos-yang-compiler-api:2.4.7",
-    "onos-yang-runtime":"mvn:org.onosproject:onos-yang-runtime:2.4.7",
-    "onos-yang-serializers-json":"mvn:org.onosproject:onos-yang-serializers-json:2.4.7",
-    "onos-yang-serializers-xml":"mvn:org.onosproject:onos-yang-serializers-xml:2.4.7",
-    "onos-yang-serializers-utils":"mvn:org.onosproject:onos-yang-serializers-utils:2.4.7",
+    "onos-yang-model":"mvn:org.onosproject:onos-yang-model:2.5",
+    "onos-yang-compiler-api":"mvn:org.onosproject:onos-yang-compiler-api:2.5",
+    "onos-yang-runtime":"mvn:org.onosproject:onos-yang-runtime:2.5",
+    "onos-yang-serializers-json":"mvn:org.onosproject:onos-yang-serializers-json:2.5",
+    "onos-yang-serializers-xml":"mvn:org.onosproject:onos-yang-serializers-xml:2.5",
+    "onos-yang-serializers-utils":"mvn:org.onosproject:onos-yang-serializers-utils:2.5",
     "org.apache.servicemix.bundles.dom4j":"mvn:org.apache.servicemix.bundles:org.apache.servicemix.bundles.dom4j:1.6.1_5",
     "plexus-utils": "mvn:org.codehaus.plexus:plexus-utils:3.0.24",
     "sshd-core": "mvn:org.apache.sshd:sshd-core:1.4.0",
diff --git a/lib/pom.xml b/lib/pom.xml
index 78a5c5a..82ae93f 100644
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -44,7 +44,7 @@
         <netty4.version>4.1.8.Final</netty4.version>
         <openflowj.version>3.2.1.onos</openflowj.version>
         <onos-maven-plugin.version>1.12</onos-maven-plugin.version>
-        <onos-yang-tools.version>2.4.7</onos-yang-tools.version>
+        <onos-yang-tools.version>2.5</onos-yang-tools.version>
         <osgi.version>5.0.0</osgi.version>
         <karaf.version>3.0.8</karaf.version>
         <jersey.version>2.26</jersey.version>
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"
diff --git a/tools/build/onos-buck b/tools/build/onos-buck
index aa5035d..0a839e0 100755
--- a/tools/build/onos-buck
+++ b/tools/build/onos-buck
@@ -9,7 +9,7 @@
 BUCK_SHA="45d8bd28f441991257babf89f7a317edb3a2b536"
 
 # onos-yang-tools buck plugin version
-YANG_VER="2.4.7"
+YANG_VER="2.5"
 ONOS_PLUGIN_VER="1.0.3"
 MAVEN_BASE="https://repo1.maven.org/maven2"
 MAVEN_ONOSPROJECT="$MAVEN_BASE/org/onosproject"
diff --git a/tools/dev/bin/patch-yang-libs b/tools/dev/bin/patch-yang-libs
index 52419f1..0e4af2d 100755
--- a/tools/dev/bin/patch-yang-libs
+++ b/tools/dev/bin/patch-yang-libs
@@ -3,8 +3,8 @@
 # Patches lib/BUCK file to use locally built YANG tools.
 # -----------------------------------------------------------------------------
 
-BVER=2.4.7
-SVER=2.5-SNAPSHOT
+BVER=2.5
+SVER=2.6-SNAPSHOT
 
 YANG_TOOLS_ROOT=${YANG_TOOLS_ROOT:-~/onos-yang-tools}