Updated Branches: refs/heads/4.2 81dfaaa90 -> b5bb0a570
Updating build_asf from the 4.1 branch, where I fixed a couple of things Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b5bb0a57 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b5bb0a57 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b5bb0a57 Branch: refs/heads/4.2 Commit: b5bb0a57086693e9972c5605845722b48354a478 Parents: 81dfaaa Author: Chip Childers <chipchild...@apache.org> Authored: Thu Jul 25 12:30:21 2013 -0400 Committer: Chip Childers <chipchild...@apache.org> Committed: Thu Jul 25 12:31:08 2013 -0400 ---------------------------------------------------------------------- tools/build/build_asf.sh | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b5bb0a57/tools/build/build_asf.sh ---------------------------------------------------------------------- diff --git a/tools/build/build_asf.sh b/tools/build/build_asf.sh index a4a4706..c2a817a 100755 --- a/tools/build/build_asf.sh +++ b/tools/build/build_asf.sh @@ -92,8 +92,14 @@ echo "found $currentversion" echo 'setting version numbers' mvn versions:set -DnewVersion=$version -P vmware -P developer -P systemvm -P simulator -P baremetal -P ucs -Dnonoss mv deps/XenServerJava/pom.xml.versionsBackup deps/XenServerJava/pom.xml -perl -pi -e 's/$ENV{'currentversion'}/$ENV{'version'}/' deps/XenServerJava/pom.xml -perl -pi -e 's/$ENV{'currentversion'}/$ENV{'version'}/' tools/apidoc/pom.xml +perl -pi -e "s/-SNAPSHOT//" deps/XenServerJava/pom.xml +perl -pi -e "s/-SNAPSHOT//" tools/apidoc/pom.xml +case "$currentversion" in + *-SNAPSHOT*) + perl -pi -e 's/-SNAPSHOT//' debian/rules + ;; +esac + git clean -f echo 'commit changes' @@ -158,4 +164,8 @@ if [ "$committosvn" == "yes" ]; then svn commit -m "Committing release candidate artifacts for $version to dist/dev/cloudstack in preparation for release vote" fi +echo 'revert version changes' +cd $sourcedir +git revert --no-edit $commitsh + echo "completed. use commit-sh of $commitsh when starting the VOTE thread"
