From 614922ff3aedbf6ef97f99b60167ce569256a175 Mon Sep 17 00:00:00 2001
From: Darren Shepherd <darren.s.shepherd@gmail.com>
Date: Mon, 7 Oct 2013 09:19:45 -0700
Subject: [PATCH] Fix vmware code inclusion into systemvm.iso and other random
 nonoss->noredist

---
 systemvm/pom.xml              | 2 +-
 tools/build/build_asf.sh      | 2 +-
 tools/build/setnextversion.sh | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/systemvm/pom.xml b/systemvm/pom.xml
index aa399402c14..9fe2688705e 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>
diff --git a/tools/build/build_asf.sh b/tools/build/build_asf.sh
index c2a817a8ffd..6170cd50df4 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
diff --git a/tools/build/setnextversion.sh b/tools/build/setnextversion.sh
index 7da3765704a..a41676db6db 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