Updated Branches: refs/heads/master 98daad930 -> 23ddf2953
Fix vmware code inclusion into systemvm.iso and other random nonoss->noredist Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/23ddf295 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/23ddf295 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/23ddf295 Branch: refs/heads/master Commit: 23ddf29532d269ce340e0e68015ea3afd2121eaa Parents: 98daad9 Author: Darren Shepherd <[email protected]> Authored: Mon Oct 7 09:19:45 2013 -0700 Committer: Darren Shepherd <[email protected]> Committed: Mon Oct 7 09:20:41 2013 -0700 ---------------------------------------------------------------------- systemvm/pom.xml | 2 +- tools/build/build_asf.sh | 2 +- tools/build/setnextversion.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/23ddf295/systemvm/pom.xml ---------------------------------------------------------------------- diff --git a/systemvm/pom.xml b/systemvm/pom.xml index aa39940..9fe2688 100644 --- a/systemvm/pom.xml +++ b/systemvm/pom.xml @@ -204,7 +204,7 @@ <id>vmware</id> <activation> <property> - <name>nonoss</name> + <name>noredist</name> </property> </activation> <dependencies> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/23ddf295/tools/build/build_asf.sh ---------------------------------------------------------------------- diff --git a/tools/build/build_asf.sh b/tools/build/build_asf.sh index c2a817a..6170cd5 100755 --- a/tools/build/build_asf.sh +++ b/tools/build/build_asf.sh @@ -90,7 +90,7 @@ export currentversion=`mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:eval 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 +mvn versions:set -DnewVersion=$version -P vmware -P developer -P systemvm -P simulator -P baremetal -P ucs -Dnoredist mv deps/XenServerJava/pom.xml.versionsBackup deps/XenServerJava/pom.xml perl -pi -e "s/-SNAPSHOT//" deps/XenServerJava/pom.xml perl -pi -e "s/-SNAPSHOT//" tools/apidoc/pom.xml http://git-wip-us.apache.org/repos/asf/cloudstack/blob/23ddf295/tools/build/setnextversion.sh ---------------------------------------------------------------------- diff --git a/tools/build/setnextversion.sh b/tools/build/setnextversion.sh index 7da3765..a41676d 100755 --- a/tools/build/setnextversion.sh +++ b/tools/build/setnextversion.sh @@ -62,7 +62,7 @@ export currentversion=`mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:eval 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 +mvn versions:set -DnewVersion=$version -P vmware -P developer -P systemvm -P simulator -P baremetal -P ucs -Dnoredist mv deps/XenServerJava/pom.xml.versionsBackup deps/XenServerJava/pom.xml perl -pi -e "s/$currentversion/$version/" deps/XenServerJava/pom.xml perl -pi -e "s/$currentversion/$version/" tools/apidoc/pom.xml
