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

[do-not-reply at jboss.org]

Author: alex.guizar at jboss.com
Date: 2010-07-05 17:06:27 -0400 (Mon, 05 Jul 2010)
New Revision: 6460

Removed:
   jbpm4/trunk/modules/test-upgrade/.settings/
Modified:
   jbpm4/trunk/modules/test-upgrade/pom.xml
   jbpm4/trunk/qa/hudson-jbpm4-upgrade.sh
Log:
JBPM-2893: fix hudson upgrade job

Modified: jbpm4/trunk/modules/test-upgrade/pom.xml
===================================================================
--- jbpm4/trunk/modules/test-upgrade/pom.xml	2010-07-04 19:19:51 UTC (rev 6459)
+++ jbpm4/trunk/modules/test-upgrade/pom.xml	2010-07-05 21:06:27 UTC (rev 6460)
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!-- ====================================================================== -->
+<!--  jBPM: Workflow in Java                                                -->
 <!--                                                                        -->
-<!--  JBoss, the OpenSource J2EE webOS                                      -->
-<!--                                                                        -->
 <!--  Distributable under LGPL license.                                     -->
 <!--  See terms of license at http://www.gnu.org.                           -->
-<!--                                                                        -->
 <!-- ====================================================================== -->
 
-<!-- $Id: pom.xml 3010 2008-11-20 08:30:16Z tom.baeyens at jboss.com $ -->
+<!-- $Id$ -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
@@ -29,7 +28,7 @@
   </parent>
 
   <dependencies>
-  	<dependency>
+    <dependency>
       <groupId>org.jbpm.jbpm4</groupId>
       <artifactId>jbpm-jpdl</artifactId>
     </dependency>
@@ -38,12 +37,12 @@
       <artifactId>jbpm-bpmn</artifactId>
     </dependency>
     <dependency>
-      <groupId>hsqldb</groupId>
-      <artifactId>hsqldb</artifactId>
-      <version>${hsqldb.version}</version>
+      <groupId>org.jbpm.jbpm4</groupId>
+      <artifactId>jbpm-test-base</artifactId>
+      <scope>test</scope>
     </dependency>
   </dependencies>
-  
+
   <profiles>
 
     <!-- -Ddatabase= -->
@@ -76,13 +75,12 @@
                     <copy todir="target/jdbc.properties" overwrite="true" failonerror="false">
                       <fileset dir="${user.home}/.jbpm4/jdbc" />
                     </copy>
-                    
                     <replace dir="target/jdbc.properties">
                       <include name="*.properties" />
                       <replacefilter token="PVM1" value="PVM2" />
                       <replacefilter token="pvm1" value="pvm2" />
                     </replace>
-                    
+
                     <ant antfile="../distro/src/main/files/install/build.xml" target="create.cfg">
                       <property name="tx" value="standalone.testsuite" />
                       <property name="mail.cfg" value="testsuite" />
@@ -91,7 +89,7 @@
                       <property name="install.src.dir" value="../distro/src/main/files/install/src" />
                       <property name="jdbc.properties.dir" value="target/jdbc.properties" />
                       <property name="logging" value="none" /> <!-- then the original logging.properties in the resources of this project will be used -->
-                    </ant> 
+                    </ant>
                   </tasks>
                 </configuration>
               </execution>
@@ -100,8 +98,5 @@
         </plugins>
       </build>
     </profile>
-
   </profiles>
-  
-
 </project>


Property changes on: jbpm4/trunk/modules/test-upgrade/pom.xml
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: jbpm4/trunk/qa/hudson-jbpm4-upgrade.sh
===================================================================
--- jbpm4/trunk/qa/hudson-jbpm4-upgrade.sh	2010-07-04 19:19:51 UTC (rev 6459)
+++ jbpm4/trunk/qa/hudson-jbpm4-upgrade.sh	2010-07-05 21:06:27 UTC (rev 6460)
@@ -2,18 +2,17 @@
 #
 # runs the upgrade tests
 
-MAVEN_OPTS="-Xmx512M"
-ANT_OPTS="-Dold.jbpm.version=$OLD_JBPM_VERSION -Ddatabase=$DATABASE -Djbpm.parent.dir=$WORKSPACE"
+export ANT_OPTS="-Dold.jbpm.version=$OLD_JBPM_VERSION -Ddatabase=$DATABASE \
+       -Djbpm.parent.dir=$WORKSPACE"
 
-cd qa/upgrade
-mvn $ANT_OPTS dependency:copy
-cd ../..
+export MAVEN_OPTS=$ANT_OPTS
 
+# build distribution
+mvn -f qa/upgrade/pom.xml dependency:copy
 mvn -U -Pdistro,integration clean install
+# set up
 ant -f qa/build.xml testsuite.upgrade.setup
-
-cd modules/test-upgrade
-mvn $ANT_OPTS clean test
-cd ../..
-
+# run test suite
+mvn -f modules/test-upgrade/pom.xml clean test
+# tear down
 ant -f qa/build.xml testsuite.upgrade.teardown