Author: nickboldt
Date: 2009-11-12 14:32:07 -0500 (Thu, 12 Nov 2009)
New Revision: 18667
Modified:
trunk/common/releng/build.properties
Log:
use MY_JAVA_HOME as set by run.sh
Modified: trunk/common/releng/build.properties
===================================================================
--- trunk/common/releng/build.properties 2009-11-12 19:30:26 UTC (rev 18666)
+++ trunk/common/releng/build.properties 2009-11-12 19:32:07 UTC (rev 18667)
@@ -14,11 +14,11 @@
build.steps=buildUpdate,buildTests,generateDigests,test,publish,cleanup
-# JBoss Hudson Variables defined in
/home/hudson/config_repository/resources/common.variables
-JAVA_HOME=${JAVA_HOME_PARENT}
-JAVA14_HOME=${JAVA_HOME_PARENT}
-JAVA50_HOME=${JAVA_HOME_PARENT}
-JAVA60_HOME=${JAVA_HOME_PARENT}
+# MY_JAVA_HOME is this Hudson slave's environment's JAVA_HOME, renamed to avoid
collision with default in org.eclipse.dash.common.releng/server.properties
+JAVA_HOME=${MY_JAVA_HOME}
+JAVA14_HOME=${MY_JAVA_HOME}
+JAVA50_HOME=${MY_JAVA_HOME}
+JAVA60_HOME=${MY_JAVA_HOME}
dependencyURLs=\
http://repository.jboss.org/eclipse/galileo/GEF-runtime-3.5.1.zip,\