Fixed onos-package and put hazelcast back into features for now.
Change-Id: If82a7bc80fb116714320f2a1ada5b1b935d01172
diff --git a/features/features.xml b/features/features.xml
index 5ad3487..ac06664 100644
--- a/features/features.xml
+++ b/features/features.xml
@@ -37,7 +37,7 @@
<bundle>mvn:joda-time/joda-time/2.5</bundle>
- <!-- bundle>mvn:com.hazelcast/hazelcast/3.4</bundle -->
+ <bundle>mvn:com.hazelcast/hazelcast/3.4</bundle>
<bundle>mvn:io.dropwizard.metrics/metrics-core/3.1.0</bundle>
<bundle>mvn:io.dropwizard.metrics/metrics-json/3.1.0</bundle>
<bundle>mvn:com.eclipsesource.minimal-json/minimal-json/0.9.1</bundle>
diff --git a/tools/build/onos-package b/tools/build/onos-package
index 78f445c..5a8f9ac 100755
--- a/tools/build/onos-package
+++ b/tools/build/onos-package
@@ -52,7 +52,7 @@
# Stage the ONOS bundles, but only those that match the version
mkdir -p $ONOS_STAGE/$KARAF_DIST/system/org/onosproject
find $M2_REPO/org/onosproject -type f -path "*/$ONOS_POM_VERSION/*" \
- -name '*.jar' -o -name '*.pom' -o -name 'features.xml' \
+ -name '*.jar' -o -name '*.pom' -o -name '*-features.xml' \
| grep -v -Ee '-tests.jar|-[0-9]{8}.[0-9]{6}-' \
| while read src; do
dst=$ONOS_STAGE/$KARAF_DIST/system/${src#$M2_REPO/*}