Updating buck version after disengaging tenbi app.
Change-Id: I6c225976f9ec12db1027b060144e34885db78434
diff --git a/modules.defs b/modules.defs
index 73b80c4..0422dbc 100644
--- a/modules.defs
+++ b/modules.defs
@@ -120,7 +120,7 @@
'//providers/link:onos-providers-link-oar',
'//providers/lisp:onos-providers-lisp-oar',
'//providers/tl1:onos-providers-tl1-oar',
- '//providers/ietfte:onos-providers-ietfte-oar',
+# '//providers/ietfte:onos-providers-ietfte-oar',
]
ONOS_APPS = [
@@ -183,8 +183,8 @@
'//apps/netconf:onos-apps-netconf-oar',
'//apps/tetopology:onos-apps-tetopology-oar',
'//apps/tetunnel:onos-apps-tetunnel-oar',
- '//apps/tenbi/yangmodel:onos-apps-tenbi-yangmodel-feature',
- '//apps/tenbi:onos-apps-tenbi-oar',
+# '//apps/tenbi/yangmodel:onos-apps-tenbi-yangmodel-feature',
+# '//apps/tenbi:onos-apps-tenbi-oar',
'//protocols/restconf/server:onos-protocols-restconf-server-oar',
'//apps/restconf:onos-apps-restconf-oar',
'//apps/flowspec-api:onos-apps-flowspec-api-oar',
diff --git a/tools/build/buck-publish-package b/tools/build/buck-publish-package
index a845ec7..596c699 100755
--- a/tools/build/buck-publish-package
+++ b/tools/build/buck-publish-package
@@ -15,14 +15,14 @@
# build plugins
pushd buck
-buck build buck
+onos-buck build buck
popd #buck
pushd onos
-buck build //tools/build/buck-plugin:onos
+onos-buck build //tools/build/buck-plugin:onos
popd #onos
-pushd onos-yang-tools
+pushd onos-yang-tools/compiler
mvn clean package
popd #onos-yang-tools
@@ -32,7 +32,7 @@
cp buck/buck-out/gen/programs/buck.pex $ZIP_STAGE/buck
cp onos/buck-out/gen/tools/build/buck-plugin/onos.jar $ZIP_STAGE/plugins/onos.jar
-cp onos-yang-tools/plugin/buck/target/onos-yang-buck-plugin-*.jar $ZIP_STAGE/plugins/yang.jar
+cp onos-yang-tools/plugin/compiler/buck/target/onos-yang-compiler-buck-plugin-*.jar $ZIP_STAGE/plugins/yang.jar
BUCK_VERSION=$(buck/buck-out/gen/programs/buck.pex -V)
echo $BUCK_VERSION > $ZIP_STAGE/.buck_version
diff --git a/tools/build/onos-buck b/tools/build/onos-buck
index de1fb8f..b82c110 100755
--- a/tools/build/onos-buck
+++ b/tools/build/onos-buck
@@ -5,8 +5,8 @@
set -e
-BUCK_URL="http://onlab.vicci.org/onos/third-party/buck-v2016.12.02.01.zip"
-BUCK_SHA="c7b1b46f998c08a175adec37f210c14092f84216"
+BUCK_URL="http://onlab.vicci.org/onos/third-party/buck-v2017.03.10.01.zip"
+BUCK_SHA="baa7bae077ef0e65b371525fd525a5763fef41c4"
REQUIRED_VERSION="buck version c4e714c9c0c774cbb674c2fde0a4419824f0cfdb"
[ "-U" = "$1" ] && shift && FORCE_UPDATE=True