[jboss-svn-commits] JBL Code SVN: r25529 - in labs/jbossbuild/buildmagic/trunk: tools/buildmagic/lib and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: pgier
Date: 2009-03-06 13:56:39 -0500 (Fri, 06 Mar 2009)
New Revision: 25529

Modified:
   labs/jbossbuild/buildmagic/trunk/tasks/build.xml
   labs/jbossbuild/buildmagic/trunk/tools/buildmagic/lib/buildmagic-tasks.jar
   labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/defaults.ent
Log:
Improved integration test setup so that junit.jar is used from the test classpath.
Update the buildmagic jar.
Update the versions listed in defaults.ent.

Modified: labs/jbossbuild/buildmagic/trunk/tasks/build.xml
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tasks/build.xml	2009-03-06 16:43:14 UTC (rev 25528)
+++ labs/jbossbuild/buildmagic/trunk/tasks/build.xml	2009-03-06 18:56:39 UTC (rev 25529)
@@ -293,12 +293,19 @@
         <fileset dir="${dist.root}"/>
       </copy>
       
+      <!-- Clean the IT project -->
       <exec executable="ant" dir="${output.it}/@{dir}/build/"
         output="${output.it}/@{dir}/buildlog.txt" resultproperty="@{dir}-clean-result">
         <arg line="clean"/>
       </exec>
+      
+      <property name="test.deps.classpath" refid="test.dependencies.classpath"/>
+      <!-- Run the IT project -->
       <exec executable="ant" dir="${output.it}/@{dir}/build/"
-        output="${output.it}/@{dir}/buildlog.txt" resultproperty="@{dir}-build-result"/>
+        output="${output.it}/@{dir}/buildlog.txt" resultproperty="@{dir}-build-result">
+        <arg line="-lib ${test.deps.classpath}"/>
+      </exec>
+      
       <fail message="Test @{dir} failed.  For more information, see ${output.it}/@{dir}/buildlog.txt">
         <condition>
           <or>

Modified: labs/jbossbuild/buildmagic/trunk/tools/buildmagic/lib/buildmagic-tasks.jar
===================================================================
(Binary files differ)

Modified: labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/defaults.ent
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/defaults.ent	2009-03-06 16:43:14 UTC (rev 25528)
+++ labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/defaults.ent	2009-03-06 18:56:39 UTC (rev 25529)
@@ -11,9 +11,9 @@
   <property name="module.version" value="DEV"/>
 
   <property name="version.major" value="2"/>
-  <property name="version.minor" value="0"/>
-  <property name="version.revision" value="2"/>
-  <property name="version.tag" value="-SNAPSHOT"/>
+  <property name="version.minor" value="1"/>
+  <property name="version.revision" value="0"/>
+  <property name="version.tag" value="ga"/>
   <property name="version.name" value=""/>
 
   <!-- This must be set to the svn tag for any release -->