diff --git a/drivers/odtn-driver/BUCK b/drivers/odtn-driver/BUCK
index d62183e..ae771f6 100644
--- a/drivers/odtn-driver/BUCK
+++ b/drivers/odtn-driver/BUCK
@@ -13,9 +13,9 @@
 
 BUNDLES = [
     ':onos-drivers-odtn-driver',
-    '//lib:commons-jxpath',
-    '//lib:commons-beanutils', # jxpath dependency
-    '//lib:jdom',  # jxpath dependency
+#     '//lib:commons-jxpath',
+#     '//lib:commons-beanutils', # jxpath dependency
+#     '//lib:jdom',  # jxpath dependency
 ]
 
 osgi_jar_with_tests (
diff --git a/features/BUCK b/features/BUCK
index be2dd94..cd9eeda 100644
--- a/features/BUCK
+++ b/features/BUCK
@@ -39,6 +39,9 @@
     '//lib:mapdb',
     '//lib:bcpkix-jdk15on',
     '//lib:bcprov-jdk15on',
+    '//lib:commons-jxpath', # FIXME: move xpath lib dependency to the right place
+    '//lib:commons-beanutils', # jxpath dependency
+    '//lib:jdom',  # jxpath dependency
   ]
 )