Fixing onos-package to include automatic karaf-assembly stage;
otherwise artifacts built using plain 'mvn' or 'obs' won't be included.
Change-Id: I71b7a27cff3a8faea2e2589a921e1f639cedd5b7
diff --git a/pom.xml b/pom.xml
index 87aa6e3..e7b9284 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,6 @@
<module>tools/package/archetypes</module>
<module>tools/package/branding</module>
- <module>tools/package/karaf-assembly</module>
<module>tools/package/maven-plugin</module>
<module>tools/build/conf</module>
</modules>
diff --git a/tools/build/onos-package b/tools/build/onos-package
index 5500208..3ca4e6e 100755
--- a/tools/build/onos-package
+++ b/tools/build/onos-package
@@ -158,6 +158,11 @@
# Bail on any errors
set -e
+# Run karaf assembly to collect artifacts for off-line installations.
+aux=/tmp/assembly-$$.log
+trap "rm -f $aux 2>/dev/null" EXIT
+cd $ONOS_ROOT/tools/package/karaf-assembly && mvn clean install > $aux 2>&1
+
# Before starting make sure the environment is clan - delete onos staging folder
rm -fr $ONOS_STAGE