홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
97a7033e 1 parent 27b69c6c

Fixed onos-package and put hazelcast back into features for now. 

Change-Id: If82a7bc80fb116714320f2a1ada5b1b935d01172
Inline Side-by-side
Showing 2 changed files with 2 additions and 2 deletions
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
37 37
38 <bundle>mvn:joda-time/joda-time/2.5</bundle> 38 <bundle>mvn:joda-time/joda-time/2.5</bundle>
39 39
40 - <!-- bundle>mvn:com.hazelcast/hazelcast/3.4</bundle --> 40 + <bundle>mvn:com.hazelcast/hazelcast/3.4</bundle>
41 <bundle>mvn:io.dropwizard.metrics/metrics-core/3.1.0</bundle> 41 <bundle>mvn:io.dropwizard.metrics/metrics-core/3.1.0</bundle>
42 <bundle>mvn:io.dropwizard.metrics/metrics-json/3.1.0</bundle> 42 <bundle>mvn:io.dropwizard.metrics/metrics-json/3.1.0</bundle>
43 <bundle>mvn:com.eclipsesource.minimal-json/minimal-json/0.9.1</bundle> 43 <bundle>mvn:com.eclipsesource.minimal-json/minimal-json/0.9.1</bundle>
......
...@@ -52,7 +52,7 @@ sed "s/\$KARAF_VERSION/$KARAF_VERSION/g" \ ...@@ -52,7 +52,7 @@ sed "s/\$KARAF_VERSION/$KARAF_VERSION/g" \
52 # Stage the ONOS bundles, but only those that match the version 52 # Stage the ONOS bundles, but only those that match the version
53 mkdir -p $ONOS_STAGE/$KARAF_DIST/system/org/onosproject 53 mkdir -p $ONOS_STAGE/$KARAF_DIST/system/org/onosproject
54 find $M2_REPO/org/onosproject -type f -path "*/$ONOS_POM_VERSION/*" \ 54 find $M2_REPO/org/onosproject -type f -path "*/$ONOS_POM_VERSION/*" \
55 - -name '*.jar' -o -name '*.pom' -o -name 'features.xml' \ 55 + -name '*.jar' -o -name '*.pom' -o -name '*-features.xml' \
56 | grep -v -Ee '-tests.jar|-[0-9]{8}.[0-9]{6}-' \ 56 | grep -v -Ee '-tests.jar|-[0-9]{8}.[0-9]{6}-' \
57 | while read src; do 57 | while read src; do
58 dst=$ONOS_STAGE/$KARAF_DIST/system/${src#$M2_REPO/*} 58 dst=$ONOS_STAGE/$KARAF_DIST/system/${src#$M2_REPO/*}
......