홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Brian O'Connor
Committed by Gerrit Code Review
68ddd74a 1 parent e167b5f0

Updating onos-change-version to roll fallback version in CoreManger 

Change-Id: I5d69a0b3f52d9f0e499663dff46692feb630a0b4
Inline Side-by-side
Showing 1 changed file with 6 additions and 0 deletions
...@@ -28,6 +28,10 @@ sed -i "" -E "s/features\/.*\/xml/features\/$NEW_VERSION\/xml/" $ONOS_ROOT/tools ...@@ -28,6 +28,10 @@ sed -i "" -E "s/features\/.*\/xml/features\/$NEW_VERSION\/xml/" $ONOS_ROOT/tools
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 sed -i "" -E "s/ONOS_POM_VERSION=.*\"/ONOS_POM_VERSION=\"$NEW_VERSION\"/" $ONOS_ROOT/tools/build/envDefaults
30 30
31 +# Augment fallback version in CoreManager
32 +sed -i "" -E "s/Version\.version\(\"[^\"]*\"\)/Version.version(\"$NEW_VERSION\")/" \
33 + $ONOS_ROOT/core/net/src/main/java/org/onosproject/core/impl/CoreManager.java
34 +
31 # Augment the version in archetypes tree. 35 # Augment the version in archetypes tree.
32 mvn -f tools/package/archetypes/pom.xml versions:set -DnewVersion=$NEW_VERSION versions:commit 36 mvn -f tools/package/archetypes/pom.xml versions:set -DnewVersion=$NEW_VERSION versions:commit
33 for atype in api bundle cli; do 37 for atype in api bundle cli; do
...@@ -35,6 +39,8 @@ for atype in api bundle cli; do ...@@ -35,6 +39,8 @@ for atype in api bundle cli; do
35 sed -i "" -E "1,/<onos.version>/s/<onos.version>[^<]*</<onos.version>$NEW_VERSION</g" $pom 39 sed -i "" -E "1,/<onos.version>/s/<onos.version>[^<]*</<onos.version>$NEW_VERSION</g" $pom
36 done 40 done
37 41
42 +# FIXME do we really want to roll the version with every release?
43 +# ... we talked about dropping to a 2 place version that rolls independently
38 pushd tools/package/maven-plugin 44 pushd tools/package/maven-plugin
39 mvn versions:set -DnewVersion=$NEW_VERSION versions:commit 45 mvn versions:set -DnewVersion=$NEW_VERSION versions:commit
40 popd 46 popd
......