Author: alessio.soldano(a)jboss.com Date: 2010-12-21 08:51:31 -0500 (Tue, 21 Dec 2010) New Revision: 13524 Modified: framework/trunk/hudson/ant.properties.example framework/trunk/hudson/build.xml Log: Upgrading to Hudson 1.226 and Tomcat 5.5.31 Modified: framework/trunk/hudson/ant.properties.example =================================================================== --- framework/trunk/hudson/ant.properties.example 2010-12-21 09:02:29 UTC (rev 13523) +++ framework/trunk/hudson/ant.properties.example 2010-12-21 13:51:31 UTC (rev 13524) @@ -32,5 +32,5 @@ hudson.smtp.host=localhost # Hudson setup -apache-tomcat=5.5.20 -sun-hudson=1.160 +apache-tomcat=5.5.31 +sun-hudson=1.226 Modified: framework/trunk/hudson/build.xml =================================================================== --- framework/trunk/hudson/build.xml 2010-12-21 09:02:29 UTC (rev 13523) +++ framework/trunk/hudson/build.xml 2010-12-21 13:51:31 UTC (rev 13524) @@ -62,7 +62,8 @@ --> <target name="hudson-tomcat-setup" depends="init-hudson" unless="hudson.tomcat.available"> - <get src="${jboss.repository}/apache-tomcat/${apache-tomcat}/lib/apache-tomcat.zip" dest="${thirdparty.dir}/apache-tomcat.zip" usetimestamp="true" verbose="true"/> + <!--<get src="${jboss.repository}/apache-tomcat/${apache-tomcat}/lib/apache-tomcat.zip" dest="${thirdparty.dir}/apache-tomcat.zip" usetimestamp="true" verbose="true"/>--> + <get src="http://mirror.nohup.it/apache/tomcat/tomcat-5/v${apache-tomcat}/bin/apache-tomcat-${apache-tomcat}.zip" dest="${thirdparty.dir}/apache-tomcat.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-hudson/${sun-hudson}/lib/hudson.war" dest="${thirdparty.dir}/hudson.war" usetimestamp="true" verbose="true"/> <mkdir dir="${hudson.root}"/> @@ -158,6 +159,7 @@ <exec executable="${hudson.tomcat}/bin/catalina.sh" failonerror="true" output="${hudson.target.dir}/hudson.log"> <env key="CATALINA_OPTS" value="-Xmx512m -Djava.awt.headless=true"/> + <env key="HUDSON_HOME" value="${hudson.home}"/> <arg line="start"/> </exec>