diff --git a/tools/build/libgen/BUCK b/tools/build/libgen/BUCK
deleted file mode 100644
index 3162ac5..0000000
--- a/tools/build/libgen/BUCK
+++ /dev/null
@@ -1,378 +0,0 @@
-java_library(
-  name = 'COMPILE',
-  visibility = ['PUBLIC'],
-  exported_deps = [
-    ':com.fasterxml.jackson.core-jackson-core-jar',
-    ':com.fasterxml.jackson.core-jackson-databind-jar',
-    ':com.fasterxml.jackson.core-jackson-annotations-jar',
-    ':org.eclipse.aether-aether-api-jar',
-    ':org.eclipse.aether-aether-util-jar',
-    ':org.apache.maven-maven-aether-provider-jar',
-    ':org.apache.maven-maven-model-jar',
-    ':org.apache.maven-maven-model-builder-jar',
-    ':org.codehaus.plexus-plexus-interpolation-jar',
-    ':org.apache.maven-maven-artifact-jar',
-    ':org.apache.maven-maven-builder-support-jar',
-    ':com.google.guava-guava-jar',
-    ':org.apache.maven-maven-repository-metadata-jar',
-    ':org.eclipse.aether-aether-spi-jar',
-    ':org.eclipse.aether-aether-impl-jar',
-    ':org.codehaus.plexus-plexus-component-annotations-jar',
-    ':org.codehaus.plexus-plexus-utils-jar',
-    ':org.apache.commons-commons-lang3-jar',
-    ':org.eclipse.aether-aether-connector-basic-jar',
-    ':org.eclipse.aether-aether-transport-file-jar',
-    ':org.eclipse.aether-aether-transport-http-jar',
-    ':org.apache.httpcomponents-httpclient-jar',
-    ':org.apache.httpcomponents-httpcore-jar',
-    ':commons-codec-commons-codec-jar',
-    ':org.slf4j-jcl-over-slf4j-jar',
-    ':org.slf4j-slf4j-api-jar'
-  ],
-)
-
-java_library(
-  name = 'RUNTIME',
-  visibility = ['PUBLIC'],
-  exported_deps = [
-    ':org.slf4j-slf4j-simple-jar'
-  ],
-)
-
-java_library(
-   name = 'libgen-jar',
-   deps = [ ':COMPILE' ],
-   srcs = glob(['src/main/java/**/*.java']),
-)
-
-java_binary(
-   name = 'libgen',
-   deps = [ ':COMPILE', ':RUNTIME', ':libgen-jar' ],
-   main_class = 'org.onosproject.libgen.BuckLibGenerator',
-)
-
-prebuilt_jar(
-  name = 'com.fasterxml.jackson.core-jackson-annotations-jar',
-  binary_jar = ':remote-com.fasterxml.jackson.core-jackson-annotations-jar',
-)
-
-remote_file(
-  name = 'remote-com.fasterxml.jackson.core-jackson-annotations-jar',
-  out = 'com.fasterxml.jackson.core-jackson-annotations-jar-2.7.0.jar',
-  url = 'mvn:com.fasterxml.jackson.core:jackson-annotations:jar:2.7.0',
-  sha1 = '19f42c154ffc689f40a77613bc32caeb17d744e3',
-)
-
-prebuilt_jar(
-  name = 'com.fasterxml.jackson.core-jackson-core-jar',
-  binary_jar = ':remote-com.fasterxml.jackson.core-jackson-core-jar',
-)
-
-remote_file(
-  name = 'remote-com.fasterxml.jackson.core-jackson-core-jar',
-  out = 'com.fasterxml.jackson.core-jackson-core-jar-2.7.0.jar',
-  url = 'mvn:com.fasterxml.jackson.core:jackson-core:jar:2.7.0',
-  sha1 = '05f2bfd0866bcacbcc7c25ce25f80b5aeed0f72f',
-)
-
-prebuilt_jar(
-  name = 'com.fasterxml.jackson.core-jackson-databind-jar',
-  binary_jar = ':remote-com.fasterxml.jackson.core-jackson-databind-jar',
-)
-
-remote_file(
-  name = 'remote-com.fasterxml.jackson.core-jackson-databind-jar',
-  out = 'com.fasterxml.jackson.core-jackson-databind-jar-2.7.0.jar',
-  url = 'mvn:com.fasterxml.jackson.core:jackson-databind:jar:2.7.0',
-  sha1 = '7d3430de9f2b600b074ba3bc007edcfbc4bbf4fb',
-)
-
-prebuilt_jar(
-  name = 'com.google.guava-guava-jar',
-  binary_jar = ':remote-com.google.guava-guava-jar',
-)
-
-remote_file(
-  name = 'remote-com.google.guava-guava-jar',
-  out = 'com.google.guava-guava-jar-18.0.jar',
-  url = 'mvn:com.google.guava:guava:jar:18.0',
-  sha1 = 'cce0823396aa693798f8882e64213b1772032b09',
-)
-
-prebuilt_jar(
-  name = 'commons-codec-commons-codec-jar',
-  binary_jar = ':remote-commons-codec-commons-codec-jar',
-)
-
-remote_file(
-  name = 'remote-commons-codec-commons-codec-jar',
-  out = 'commons-codec-commons-codec-jar-1.6.jar',
-  url = 'mvn:commons-codec:commons-codec:jar:1.6',
-  sha1 = 'b7f0fc8f61ecadeb3695f0b9464755eee44374d4',
-)
-
-prebuilt_jar(
-  name = 'org.apache.commons-commons-lang3-jar',
-  binary_jar = ':remote-org.apache.commons-commons-lang3-jar',
-)
-
-remote_file(
-  name = 'remote-org.apache.commons-commons-lang3-jar',
-  out = 'org.apache.commons-commons-lang3-jar-3.4.jar',
-  url = 'mvn:org.apache.commons:commons-lang3:jar:3.4',
-  sha1 = '5fe28b9518e58819180a43a850fbc0dd24b7c050',
-)
-
-prebuilt_jar(
-  name = 'org.apache.httpcomponents-httpclient-jar',
-  binary_jar = ':remote-org.apache.httpcomponents-httpclient-jar',
-)
-
-remote_file(
-  name = 'remote-org.apache.httpcomponents-httpclient-jar',
-  out = 'org.apache.httpcomponents-httpclient-jar-4.3.5.jar',
-  url = 'mvn:org.apache.httpcomponents:httpclient:jar:4.3.5',
-  sha1 = '9783d89b8eea20a517a4afc5f979bd2882b54c44',
-)
-
-prebuilt_jar(
-  name = 'org.apache.httpcomponents-httpcore-jar',
-  binary_jar = ':remote-org.apache.httpcomponents-httpcore-jar',
-)
-
-remote_file(
-  name = 'remote-org.apache.httpcomponents-httpcore-jar',
-  out = 'org.apache.httpcomponents-httpcore-jar-4.3.2.jar',
-  url = 'mvn:org.apache.httpcomponents:httpcore:jar:4.3.2',
-  sha1 = '31fbbff1ddbf98f3aa7377c94d33b0447c646b6e',
-)
-
-prebuilt_jar(
-  name = 'org.apache.maven-maven-aether-provider-jar',
-  binary_jar = ':remote-org.apache.maven-maven-aether-provider-jar',
-)
-
-remote_file(
-  name = 'remote-org.apache.maven-maven-aether-provider-jar',
-  out = 'org.apache.maven-maven-aether-provider-jar-3.3.9.jar',
-  url = 'mvn:org.apache.maven:maven-aether-provider:jar:3.3.9',
-  sha1 = '29e8e7122f7a166ea53785cd75af0ef9d4d848d4',
-)
-
-prebuilt_jar(
-  name = 'org.apache.maven-maven-artifact-jar',
-  binary_jar = ':remote-org.apache.maven-maven-artifact-jar',
-)
-
-remote_file(
-  name = 'remote-org.apache.maven-maven-artifact-jar',
-  out = 'org.apache.maven-maven-artifact-jar-3.3.9.jar',
-  url = 'mvn:org.apache.maven:maven-artifact:jar:3.3.9',
-  sha1 = '0f43afa184555fbc6e36b3334b17246c39b30f6e',
-)
-
-prebuilt_jar(
-  name = 'org.apache.maven-maven-builder-support-jar',
-  binary_jar = ':remote-org.apache.maven-maven-builder-support-jar',
-)
-
-remote_file(
-  name = 'remote-org.apache.maven-maven-builder-support-jar',
-  out = 'org.apache.maven-maven-builder-support-jar-3.3.9.jar',
-  url = 'mvn:org.apache.maven:maven-builder-support:jar:3.3.9',
-  sha1 = 'a96f29da7623c0e1db9824f628548fe8181f6dd0',
-)
-
-prebuilt_jar(
-  name = 'org.apache.maven-maven-model-jar',
-  binary_jar = ':remote-org.apache.maven-maven-model-jar',
-)
-
-remote_file(
-  name = 'remote-org.apache.maven-maven-model-jar',
-  out = 'org.apache.maven-maven-model-jar-3.3.9.jar',
-  url = 'mvn:org.apache.maven:maven-model:jar:3.3.9',
-  sha1 = '6efde8cbcb4de4c47f7e9c2a3ab2806022b5c70f',
-)
-
-prebuilt_jar(
-  name = 'org.apache.maven-maven-model-builder-jar',
-  binary_jar = ':remote-org.apache.maven-maven-model-builder-jar',
-)
-
-remote_file(
-  name = 'remote-org.apache.maven-maven-model-builder-jar',
-  out = 'org.apache.maven-maven-model-builder-jar-3.3.9.jar',
-  url = 'mvn:org.apache.maven:maven-model-builder:jar:3.3.9',
-  sha1 = 'e2055f9adb9f3c9a93e6b36fffe79781a785de2d',
-)
-
-prebuilt_jar(
-  name = 'org.apache.maven-maven-repository-metadata-jar',
-  binary_jar = ':remote-org.apache.maven-maven-repository-metadata-jar',
-)
-
-remote_file(
-  name = 'remote-org.apache.maven-maven-repository-metadata-jar',
-  out = 'org.apache.maven-maven-repository-metadata-jar-3.3.9.jar',
-  url = 'mvn:org.apache.maven:maven-repository-metadata:jar:3.3.9',
-  sha1 = '6850232b35e504057d67bde11efddebf6271e1ce',
-)
-
-prebuilt_jar(
-  name = 'org.codehaus.plexus-plexus-component-annotations-jar',
-  binary_jar = ':remote-org.codehaus.plexus-plexus-component-annotations-jar',
-)
-
-remote_file(
-  name = 'remote-org.codehaus.plexus-plexus-component-annotations-jar',
-  out = 'org.codehaus.plexus-plexus-component-annotations-jar-1.6.jar',
-  url = 'mvn:org.codehaus.plexus:plexus-component-annotations:jar:1.6',
-  sha1 = '1a34a4e12b5fded8c548a568f463dfee21500927',
-)
-
-prebuilt_jar(
-  name = 'org.codehaus.plexus-plexus-interpolation-jar',
-  binary_jar = ':remote-org.codehaus.plexus-plexus-interpolation-jar',
-)
-
-remote_file(
-  name = 'remote-org.codehaus.plexus-plexus-interpolation-jar',
-  out = 'org.codehaus.plexus-plexus-interpolation-jar-1.21.jar',
-  url = 'mvn:org.codehaus.plexus:plexus-interpolation:jar:1.21',
-  sha1 = 'f92de59d295f16868001644acc21720f3ec9eb15',
-)
-
-prebuilt_jar(
-  name = 'org.codehaus.plexus-plexus-utils-jar',
-  binary_jar = ':remote-org.codehaus.plexus-plexus-utils-jar',
-)
-
-remote_file(
-  name = 'remote-org.codehaus.plexus-plexus-utils-jar',
-  out = 'org.codehaus.plexus-plexus-utils-jar-3.0.22.jar',
-  url = 'mvn:org.codehaus.plexus:plexus-utils:jar:3.0.22',
-  sha1 = '764f26e0ab13a87c48fe55f525dfb6a133b7a92f',
-)
-
-prebuilt_jar(
-  name = 'org.eclipse.aether-aether-api-jar',
-  binary_jar = ':remote-org.eclipse.aether-aether-api-jar',
-)
-
-remote_file(
-  name = 'remote-org.eclipse.aether-aether-api-jar',
-  out = 'org.eclipse.aether-aether-api-jar-1.1.0.jar',
-  url = 'mvn:org.eclipse.aether:aether-api:jar:1.1.0',
-  sha1 = '05dd291e788f50dfb48822dab29defc16ad70860',
-)
-
-prebuilt_jar(
-  name = 'org.eclipse.aether-aether-connector-basic-jar',
-  binary_jar = ':remote-org.eclipse.aether-aether-connector-basic-jar',
-)
-
-remote_file(
-  name = 'remote-org.eclipse.aether-aether-connector-basic-jar',
-  out = 'org.eclipse.aether-aether-connector-basic-jar-1.1.0.jar',
-  url = 'mvn:org.eclipse.aether:aether-connector-basic:jar:1.1.0',
-  sha1 = 'f5c784bdd704ff64166c086eb6b31e2784c87b66',
-)
-
-prebuilt_jar(
-  name = 'org.eclipse.aether-aether-impl-jar',
-  binary_jar = ':remote-org.eclipse.aether-aether-impl-jar',
-)
-
-remote_file(
-  name = 'remote-org.eclipse.aether-aether-impl-jar',
-  out = 'org.eclipse.aether-aether-impl-jar-1.0.2.v20150114.jar',
-  url = 'mvn:org.eclipse.aether:aether-impl:jar:1.0.2.v20150114',
-  sha1 = 'f147539e6e60dfbda9ef7f6d750066170f61b7a1',
-)
-
-prebuilt_jar(
-  name = 'org.eclipse.aether-aether-spi-jar',
-  binary_jar = ':remote-org.eclipse.aether-aether-spi-jar',
-)
-
-remote_file(
-  name = 'remote-org.eclipse.aether-aether-spi-jar',
-  out = 'org.eclipse.aether-aether-spi-jar-1.0.2.v20150114.jar',
-  url = 'mvn:org.eclipse.aether:aether-spi:jar:1.0.2.v20150114',
-  sha1 = '8428dfa330107984f3e3ac05cc3ebd50b2676866',
-)
-
-prebuilt_jar(
-  name = 'org.eclipse.aether-aether-transport-file-jar',
-  binary_jar = ':remote-org.eclipse.aether-aether-transport-file-jar',
-)
-
-remote_file(
-  name = 'remote-org.eclipse.aether-aether-transport-file-jar',
-  out = 'org.eclipse.aether-aether-transport-file-jar-1.1.0.jar',
-  url = 'mvn:org.eclipse.aether:aether-transport-file:jar:1.1.0',
-  sha1 = '5c257319ccba22a02fa583c3946bfcbb47638bc8',
-)
-
-prebuilt_jar(
-  name = 'org.eclipse.aether-aether-transport-http-jar',
-  binary_jar = ':remote-org.eclipse.aether-aether-transport-http-jar',
-)
-
-remote_file(
-  name = 'remote-org.eclipse.aether-aether-transport-http-jar',
-  out = 'org.eclipse.aether-aether-transport-http-jar-1.1.0.jar',
-  url = 'mvn:org.eclipse.aether:aether-transport-http:jar:1.1.0',
-  sha1 = '5beffae29e88251ac419bf96dd1426babdb6a66f',
-)
-
-prebuilt_jar(
-  name = 'org.eclipse.aether-aether-util-jar',
-  binary_jar = ':remote-org.eclipse.aether-aether-util-jar',
-)
-
-remote_file(
-  name = 'remote-org.eclipse.aether-aether-util-jar',
-  out = 'org.eclipse.aether-aether-util-jar-1.1.0.jar',
-  url = 'mvn:org.eclipse.aether:aether-util:jar:1.1.0',
-  sha1 = 'd0f84ba994f0133580e8b957a44593eaa03d42cd',
-)
-
-prebuilt_jar(
-  name = 'org.slf4j-jcl-over-slf4j-jar',
-  binary_jar = ':remote-org.slf4j-jcl-over-slf4j-jar',
-)
-
-remote_file(
-  name = 'remote-org.slf4j-jcl-over-slf4j-jar',
-  out = 'org.slf4j-jcl-over-slf4j-jar-1.6.2.jar',
-  url = 'mvn:org.slf4j:jcl-over-slf4j:jar:1.6.2',
-  sha1 = 'ac4cd2d6d0cf4342b4e8fd520c686851fc681912',
-)
-
-prebuilt_jar(
-  name = 'org.slf4j-slf4j-api-jar',
-  binary_jar = ':remote-org.slf4j-slf4j-api-jar',
-)
-
-remote_file(
-  name = 'remote-org.slf4j-slf4j-api-jar',
-  out = 'org.slf4j-slf4j-api-jar-1.6.2.jar',
-  url = 'mvn:org.slf4j:slf4j-api:jar:1.6.2',
-  sha1 = '8619e95939167fb37245b5670135e4feb0ec7d50',
-)
-
-prebuilt_jar(
-  name = 'org.slf4j-slf4j-simple-jar',
-  binary_jar = ':remote-org.slf4j-slf4j-simple-jar',
-)
-
-remote_file(
-  name = 'remote-org.slf4j-slf4j-simple-jar',
-  out = 'org.slf4j-slf4j-simple-jar-1.6.2.jar',
-  url = 'mvn:org.slf4j:slf4j-simple:jar:1.6.2',
-  sha1 = '95bfd2d7c46bca76886989fcbb1d1b58dfbfd0a6',
-)
-
-
diff --git a/tools/build/libgen/pom.xml b/tools/build/libgen/pom.xml
index 13faf10..057dfa7 100644
--- a/tools/build/libgen/pom.xml
+++ b/tools/build/libgen/pom.xml
@@ -27,11 +27,11 @@
     </parent>
 
     <groupId>org.onosproject</groupId>
-    <artifactId>libgen</artifactId>
+    <artifactId>onos-libgen</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.3-SNAPSHOT</version>
 
-    <description>Buck third-party library generator</description>
+    <description>Third-party library generator for Buck and Bazel workspaces</description>
     <url>http://onosproject.org/</url>
 
     <scm>
@@ -68,16 +68,6 @@
             <artifactId>aether-util</artifactId>
             <version>1.1.0</version>
         </dependency>
-        <!--<dependency>-->
-            <!--<groupId>commons-configuration</groupId>-->
-            <!--<artifactId>commons-configuration</artifactId>-->
-            <!--<version>1.10</version>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>commons-collections</groupId>-->
-            <!--<artifactId>commons-collections</artifactId>-->
-            <!--<version>3.2.2</version>-->
-        <!--</dependency>-->
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-aether-provider</artifactId>
diff --git a/tools/build/onos-lib-gen b/tools/build/onos-lib-gen
index cbe703e..823065c 100755
--- a/tools/build/onos-lib-gen
+++ b/tools/build/onos-lib-gen
@@ -1,13 +1,25 @@
 #!/bin/bash
+# -----------------------------------------------------------------------------
+# Generates catalog of third-party worspace dependencies for Bazel and Buck
+# -----------------------------------------------------------------------------
 
 set -e
 
-# force the correct version of buck to be downloaded
-onos-buck --version
+[ ! -d "$ONOS_ROOT" ] && echo "ONOS_ROOT is not defined" >&2 && exit 1
+cd $ONOS_ROOT
 
+REPO=${M2_REPO:-~/.m2/repository}
+VER=1.2
+ARTIFACT=org/onosproject/onos-libgen/$VER/onos-libgen-$VER.jar
+JAR=$REPO/$ARTIFACT
 
-cd $(onos-buck root 2>/dev/null)
-JAR=$(onos-buck build //tools/build/libgen:libgen --show-output 2>/dev/null | tail -1 | cut -d\  -f2)
+# Download the onos-libgen binary if needed
+if [ ! -f $JAR ]; then
+    printf "Downloading onos-libgen-$VER.jar..."
+    mkdir -p $(dirname $JAR)
+    curl http://repo1.maven.org/maven2/$ARTIFACT > $JAR
+    [ -f $JAR ] && printf "Done.\n"
+fi
 
-java -jar $JAR lib/deps.json lib/BUCK
 java -jar $JAR lib/deps.json tools/build/bazel/generate_workspace.bzl --bazel
+java -jar $JAR lib/deps.json lib/BUCK