[jboss-cvs] JBossAS SVN: r87212 - in branches/Branch_5_x: build and 1 other directories.

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

Author: pgier
Date: 2009-04-13 18:23:59 -0400 (Mon, 13 Apr 2009)
New Revision: 87212

Modified:
   branches/Branch_5_x/build/build.xml
   branches/Branch_5_x/pom.xml
   branches/Branch_5_x/thirdparty/pom.xml
Log:
Combine the thirdparty and component-matrix calls to maven.  This way maven is only called once during normal builds instead of twice.

Modified: branches/Branch_5_x/build/build.xml
===================================================================
--- branches/Branch_5_x/build/build.xml	2009-04-13 21:49:46 UTC (rev 87211)
+++ branches/Branch_5_x/build/build.xml	2009-04-13 22:23:59 UTC (rev 87212)
@@ -973,7 +973,7 @@
 
   <!-- Clean up all build output -->
   <target name="clean" description="Cleans up most generated files."
-          depends="checkthirdparty, maven-clean, _buildmagic:clean, 
+          depends="maven-clean, checkthirdparty, _buildmagic:clean, 
                    modules-clean">
   </target>
 
@@ -991,10 +991,10 @@
   <target name="main" depends="most"
 	  description="Executes the default target (most)."/>
 
-  <target name="all" depends="createthirdparty, modules-all, install"
+  <target name="all" depends="maven-install, modules-all, install"
 	  description="Executes all modules and builds everything."/>
 
-  <target name="most" depends="maven-install, createthirdparty, modules-most, install"
+  <target name="most" depends="maven-install, modules-most, install"
 	  description="Executes all modules and builds most everything."/>
 
   <target name="release" depends="most" />

Modified: branches/Branch_5_x/pom.xml
===================================================================
--- branches/Branch_5_x/pom.xml	2009-04-13 21:49:46 UTC (rev 87211)
+++ branches/Branch_5_x/pom.xml	2009-04-13 22:23:59 UTC (rev 87212)
@@ -419,6 +419,7 @@
       <id>integrated-build</id>
       <modules>
         <module>component-matrix</module>
+        <module>thirdparty</module>
       </modules>
     </profile>
     

Modified: branches/Branch_5_x/thirdparty/pom.xml
===================================================================
--- branches/Branch_5_x/thirdparty/pom.xml	2009-04-13 21:49:46 UTC (rev 87211)
+++ branches/Branch_5_x/thirdparty/pom.xml	2009-04-13 22:23:59 UTC (rev 87212)
@@ -1950,6 +1950,7 @@
                   <goal>sources</goal>
                 </goals>
                 <configuration>
+                  <markersDirectory>${basedir}/dependency-maven-plugin-markers</markersDirectory>
                   <silent>true</silent>
                 </configuration>
               </execution>