Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 011A91069C for ; Mon, 7 Oct 2013 16:21:48 +0000 (UTC) Received: (qmail 38380 invoked by uid 500); 7 Oct 2013 16:21:47 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 38183 invoked by uid 500); 7 Oct 2013 16:21:47 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 38176 invoked by uid 99); 7 Oct 2013 16:21:47 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Oct 2013 16:21:47 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1941A9116F5; Mon, 7 Oct 2013 16:21:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: darren@apache.org To: commits@cloudstack.apache.org Message-Id: <92a147a2d13c4b67a31f737131dd9971@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/spring-modularization to 614922f Date: Mon, 7 Oct 2013 16:21:47 +0000 (UTC) Updated Branches: refs/heads/spring-modularization 7c72aa96d -> 614922ff3 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/614922ff Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/614922ff Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/614922ff Branch: refs/heads/spring-modularization Commit: 614922ff3aedbf6ef97f99b60167ce569256a175 Parents: 7c72aa9 Author: Darren Shepherd Authored: Mon Oct 7 09:19:45 2013 -0700 Committer: Darren Shepherd Committed: Mon Oct 7 09:21:15 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/614922ff/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 @@ vmware - nonoss + noredist http://git-wip-us.apache.org/repos/asf/cloudstack/blob/614922ff/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/614922ff/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