[jbpm-commits] JBoss JBPM SVN: r6086 - in jbpm4/trunk: qa and 1 other directory.

[do-not-reply at jboss.org]

Author: tom.baeyens at jboss.com
Date: 2010-01-18 04:55:50 -0500 (Mon, 18 Jan 2010)
New Revision: 6086

Modified:
   jbpm4/trunk/modules/test-upgrade/pom.xml
   jbpm4/trunk/qa/build.xml
   jbpm4/trunk/qa/hudson-jbpm4-upgrade.bat
   jbpm4/trunk/qa/hudson-jbpm4-upgrade.sh
Log:
fixing upgrade ci

Modified: jbpm4/trunk/modules/test-upgrade/pom.xml
===================================================================
--- jbpm4/trunk/modules/test-upgrade/pom.xml	2010-01-16 03:29:46 UTC (rev 6085)
+++ jbpm4/trunk/modules/test-upgrade/pom.xml	2010-01-18 09:55:50 UTC (rev 6086)
@@ -34,6 +34,10 @@
       <artifactId>jbpm-jpdl</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.jbpm.jbpm4</groupId>
+      <artifactId>jbpm-bpmn</artifactId>
+    </dependency>
+    <dependency>
       <groupId>hsqldb</groupId>
       <artifactId>hsqldb</artifactId>
       <version>${hsqldb.version}</version>

Modified: jbpm4/trunk/qa/build.xml
===================================================================
--- jbpm4/trunk/qa/build.xml	2010-01-16 03:29:46 UTC (rev 6085)
+++ jbpm4/trunk/qa/build.xml	2010-01-18 09:55:50 UTC (rev 6086)
@@ -258,6 +258,9 @@
     <mkdir dir="upgrade/target/jbpm-test-upgrade" />
     <unzip dest="upgrade/target/jbpm-test-upgrade" src="upgrade/target/jbpm-test-upgrade.jar" />
     <delete file="upgrade/target/jbpm-test-upgrade/hibernate.properties" />
+  	
+    <ant antfile="${jbpm.home}/install/build.xml" target="install.hsqldb.server" />
+    <ant antfile="${jbpm.home}/install/build.xml" target="start.hsqldb.server" />
     
     <!-- create jbpm schema using the old jbpm distro -->
     <condition property="is.old.jbpm.40">

Modified: jbpm4/trunk/qa/hudson-jbpm4-upgrade.bat
===================================================================
--- jbpm4/trunk/qa/hudson-jbpm4-upgrade.bat	2010-01-16 03:29:46 UTC (rev 6085)
+++ jbpm4/trunk/qa/hudson-jbpm4-upgrade.bat	2010-01-18 09:55:50 UTC (rev 6086)
@@ -6,7 +6,6 @@
 cd ..\..
 
 cmd /C mvn -U -Pdistro,integration clean install
-start ant -f qa/build.xml %ANT_PROPERTIES% start.hsqldb
 cmd /C ant -f qa/build.xml %ANT_PROPERTIES% testsuite.upgrade.setup
 
 cd modules\test-upgrade

Modified: jbpm4/trunk/qa/hudson-jbpm4-upgrade.sh
===================================================================
--- jbpm4/trunk/qa/hudson-jbpm4-upgrade.sh	2010-01-16 03:29:46 UTC (rev 6085)
+++ jbpm4/trunk/qa/hudson-jbpm4-upgrade.sh	2010-01-18 09:55:50 UTC (rev 6086)
@@ -11,7 +11,6 @@
 cd ../..
 
 mvn -U -Pdistro,integration clean install
-ant -f qa/build.xml $ANT_PROPERTIES start.hsqldb &
 ant -f qa/build.xml $ANT_PROPERTIES testsuite.upgrade.setup
 
 cd modules/test-upgrade