Brian O'Connor

Updating POM_VERSION in envDefaults

Change-Id: Ie1ddfda0caf30d1f35ba3ae0e408ea1887348676
...@@ -18,7 +18,7 @@ export PATH="$PATH:$ONOS_ROOT/tools/build" ...@@ -18,7 +18,7 @@ export PATH="$PATH:$ONOS_ROOT/tools/build"
18 export BUILD_NUMBER=${BUILD_NUMBER:-$(id -un)~$(date +'%Y/%m/%d@%H:%M')} 18 export BUILD_NUMBER=${BUILD_NUMBER:-$(id -un)~$(date +'%Y/%m/%d@%H:%M')}
19 19
20 # ONOS Version and onos.tar.gz staging environment 20 # ONOS Version and onos.tar.gz staging environment
21 -export ONOS_POM_VERSION="1.1.0-SNAPSHOT" 21 +export ONOS_POM_VERSION="1.2.0-SNAPSHOT"
22 export ONOS_VERSION=${ONOS_VERSION:-1.2.0.$BUILD_NUMBER} 22 export ONOS_VERSION=${ONOS_VERSION:-1.2.0.$BUILD_NUMBER}
23 23
24 # ONOS production bits (onos.tar.gz & onos.zip) staging environment 24 # ONOS production bits (onos.tar.gz & onos.zip) staging environment
......
...@@ -26,6 +26,7 @@ done ...@@ -26,6 +26,7 @@ done
26 sed -i "" -E "s/ONOS_VERSION:-[^$]*/ONOS_VERSION:-$NEW_VERSION_SHORT./" $ONOS_ROOT/tools/build/envDefaults 26 sed -i "" -E "s/ONOS_VERSION:-[^$]*/ONOS_VERSION:-$NEW_VERSION_SHORT./" $ONOS_ROOT/tools/build/envDefaults
27 sed -i "" -E "s/features\/.*\/xml/features\/$NEW_VERSION\/xml/" $ONOS_ROOT/tools/test/topos/onos.py 27 sed -i "" -E "s/features\/.*\/xml/features\/$NEW_VERSION\/xml/" $ONOS_ROOT/tools/test/topos/onos.py
28 sed -i "" -E "s/ -Dversion=.*\"/ -Dversion=$NEW_VERSION\"/" $ONOS_ROOT/tools/test/bin/onos-archetypes-test 28 sed -i "" -E "s/ -Dversion=.*\"/ -Dversion=$NEW_VERSION\"/" $ONOS_ROOT/tools/test/bin/onos-archetypes-test
29 +sed -i "" -E "s/ONOS_POM_VERSION=.*\"/ONOS_POM_VERSION=\"$NEW_VERSION\"/" $ONOS_ROOT/tools/build/envDefaults
29 30
30 # Augment the version in archetypes tree. 31 # Augment the version in archetypes tree.
31 mvn -f tools/package/archetypes/pom.xml versions:set -DnewVersion=$NEW_VERSION versions:commit 32 mvn -f tools/package/archetypes/pom.xml versions:set -DnewVersion=$NEW_VERSION versions:commit
......