Updates to versions across project
Change-Id: I3593d5d289d3149bea9644c7c09fa1ca753abfca
diff --git a/tools/build/onos-change-version b/tools/build/onos-change-version
index a711742..b41255b 100755
--- a/tools/build/onos-change-version
+++ b/tools/build/onos-change-version
@@ -41,7 +41,7 @@
# Augment the version in archetypes tree.
mvn -f tools/package/archetypes/pom.xml versions:set -DnewVersion=$NEW_VERSION versions:commit
-for atype in api bundle cli ui; do
+for atype in api bundle cli ui uitab uitopo; do
pom="tools/package/archetypes/$atype/src/main/resources/archetype-resources/pom.xml"
sed -i "" -E "1,/<onos.version>/s/<onos.version>[^<]*</<onos.version>$NEW_VERSION</g" $pom
done
@@ -51,6 +51,3 @@
perl -i -0pe "s#<artifactId>cord-gui<.*\n.*version>#<artifactId>cord-gui</artifactId>\n <version>$NEW_VERSION</version>#" $ONOS_ROOT/apps/demo/cord-gui/pom.xml
sed -i "" -E "s#demo/cord-gui/target/cord-gui-.*\.war#demo/cord-gui/target/cord-gui-$NEW_VERSION.war#" $ONOS_ROOT/apps/demo/cord-gui/src/scripts/pullwar.sh
sed -i "" -E "s#CORD=./cord-gui-.*\.war#CORD=./cord-gui-$NEW_VERSION.war#" $ONOS_ROOT/apps/demo/cord-gui/src/scripts/run.me
-
-# Augment the acl app
-sed -i "" -E "s/<onos.version>[^<]*</<onos.version>$NEW_VERSION</g" $ONOS_ROOT/apps/acl/pom.xml
diff --git a/tools/package/karaf-assembly/pom.xml b/tools/package/karaf-assembly/pom.xml
index 38a3df4..4b47c0d 100644
--- a/tools/package/karaf-assembly/pom.xml
+++ b/tools/package/karaf-assembly/pom.xml
@@ -22,12 +22,13 @@
<parent>
<groupId>org.onosproject</groupId>
- <artifactId>onos</artifactId>
- <version>1.4.0-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
+ <artifactId>onos-base</artifactId>
+ <version>1</version>
</parent>
+ <groupId>org.onosproject</groupId>
<artifactId>onos-assembly</artifactId>
+ <version>1.0</version>
<packaging>pom</packaging>
<description>ONOS Apache Karaf assembly definitions</description>